compiler.cfg: Fix some unit tests

diff --git a/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor b/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
index 7c1b99dfda0ede5b6ab45d3b7624d8052bcaa16b..68f7544e8e12a472eae9640a875f64060ed45f0c 100644 (file)
--- a/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
+++ b/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
@@ -48,9 +48,9 @@ H{ } clone spill-temps set
 
 [
     {
-        T{ _spill { src 1 } { class int-regs } { n 10 } }
-        T{ _copy { dst 1 } { src 0 } { class int-regs } }
-        T{ _reload { dst 0 } { class int-regs } { n 10 } }
+        T{ _spill { src 0 } { class int-regs } { n 10 } }
+        T{ _copy { dst 0 } { src 1 } { class int-regs } }
+        T{ _reload { dst 1 } { class int-regs } { n 10 } }
     }
 ] [
     { { { 0 int-regs } { 1 int-regs } } { { 1 int-regs } { 0 int-regs } } }

diff --git a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
index 60d06fcde4d63406ec5269ec6f6b69f7c61663a0..bec0c27aebd751c4674981c25d6f463e8ea4eabb 100644 (file)
--- a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
+++ b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
@@ -3,7 +3,7 @@ USING: compiler.cfg.value-numbering compiler.cfg.instructions
 compiler.cfg.registers compiler.cfg.debugger compiler.cfg.comparisons
 cpu.architecture tools.test kernel math combinators.short-circuit
 accessors sequences compiler.cfg.predecessors locals
-compiler.cfg.phi-elimination compiler.cfg.dce
+compiler.cfg.dce compiler.cfg.coalescing
 compiler.cfg assocs vectors arrays layouts namespaces ;
 
 : trim-temps ( insns -- insns )
@@ -1191,14 +1191,14 @@ test-diamond
     cfg new 0 get >>entry
     value-numbering
     compute-predecessors
-    eliminate-phis drop
+    coalesce drop
 ] unit-test
 
 [ 1 ] [ 1 get successors>> length ] unit-test
 
 [ t ] [ 1 get successors>> first 3 get eq? ] unit-test
 
-[ 3 ] [ 4 get instructions>> length ] unit-test
+[ 2 ] [ 4 get instructions>> length ] unit-test
 
 V{
     T{ ##peek f V int-regs 0 D 0 }