compiler.cfg.gvn: convert expressions, graph, and misc to before the half-baked avail...

diff --git a/extra/compiler/cfg/gvn/expressions/expressions.factor b/extra/compiler/cfg/gvn/expressions/expressions.factor
index 46b9ace4116a6a1159cc17a4fe113087ffcd48d0..c656d4ccc078941e2b29464cc1bf69232f92177b 100644 (file)
--- a/extra/compiler/cfg/gvn/expressions/expressions.factor
+++ b/extra/compiler/cfg/gvn/expressions/expressions.factor
@@ -88,4 +88,4 @@ M: ##load-reference >expr obj>> <reference-expr> ;
 ! phi equivalences
 
 M: ##phi >expr
-    inputs>> values [ vreg>leader ] map \ ##phi prefix ;
+    inputs>> values [ vreg>vn ] map \ ##phi prefix ;

diff --git a/extra/compiler/cfg/gvn/graph/graph.factor b/extra/compiler/cfg/gvn/graph/graph.factor
index 351456d6012aac6404bba6b7d42e4b25ddae3747..54ad5023362608d4619c67757540fb411ff1705a 100644 (file)
--- a/extra/compiler/cfg/gvn/graph/graph.factor
+++ b/extra/compiler/cfg/gvn/graph/graph.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors compiler.cfg.gvn.avail kernel math namespaces
-assocs ;
+USING: accessors kernel math namespaces assocs ;
 IN: compiler.cfg.gvn.graph
 
 SYMBOL: input-expr-counter
@@ -25,10 +24,7 @@ SYMBOL: final-iteration?
 
 : vn>insn ( vn -- insn ) vns>insns get at ;
 
-: vreg>leader ( vreg -- vn ) vregs>vns get at ;
-
-: vreg>vn ( vreg -- vn )
-    dup vreg>leader dup available? [ nip ] [ drop ] if ;
+: vreg>vn ( vreg -- vn ) vregs>vns get at ;
 
 : set-vn ( vn vreg -- )
     vregs>vns get maybe-set-at [ changed? on ] when ;

diff --git a/extra/compiler/cfg/gvn/misc/misc.factor b/extra/compiler/cfg/gvn/misc/misc.factor
index cbf1f8d66fc1e3fab171fcf8fc8d863cb4d84ed6..9e23ae3bdd2aa6b10efc9f3444364b861cc3fba5 100644 (file)
--- a/extra/compiler/cfg/gvn/misc/misc.factor
+++ b/extra/compiler/cfg/gvn/misc/misc.factor
@@ -16,7 +16,7 @@ M: ##replace rewrite
     ] [ 2drop f ] if ;
 
 M: ##phi rewrite
-    [ dst>> ] [ inputs>> values [ vreg>leader ] map sift ] bi
+    [ dst>> ] [ inputs>> values [ vreg>vn ] map sift ] bi
     dup all-equal? [
         [ drop f ]
         [ first <copy> ] if-empty