Fix bootstrap and unit test

diff --git a/basis/compiler/cfg/optimizer/optimizer.factor b/basis/compiler/cfg/optimizer/optimizer.factor
index 60c2380f7e8d05d3d12de152861a906553597a74..e789fc9c2138f5d4494ae3cdf239d95964d946df 100644 (file)
--- a/basis/compiler/cfg/optimizer/optimizer.factor
+++ b/basis/compiler/cfg/optimizer/optimizer.factor
@@ -3,7 +3,6 @@
 USING: kernel sequences accessors combinators namespaces
 compiler.cfg.predecessors
 compiler.cfg.useless-blocks
-compiler.cfg.height
 compiler.cfg.stack-analysis
 compiler.cfg.alias-analysis
 compiler.cfg.value-numbering

diff --git a/basis/compiler/cfg/stack-analysis/stack-analysis-tests.factor b/basis/compiler/cfg/stack-analysis/stack-analysis-tests.factor
index cb0a800927659b3a359532f3908b8dc4427a3e36..e01d870bf2b42e64ec8b02f7a2b9dfcef75d435f 100644 (file)
--- a/basis/compiler/cfg/stack-analysis/stack-analysis-tests.factor
+++ b/basis/compiler/cfg/stack-analysis/stack-analysis-tests.factor
@@ -2,7 +2,7 @@ USING: prettyprint compiler.cfg.debugger compiler.cfg.linearization
 compiler.cfg.predecessors compiler.cfg.stack-analysis
 compiler.cfg.instructions sequences kernel tools.test accessors
 sequences.private alien math combinators.private compiler.cfg
-compiler.cfg.checker compiler.cfg.height compiler.cfg.rpo
+compiler.cfg.checker compiler.cfg.rpo
 compiler.cfg.dce compiler.cfg.registers compiler.cfg.useless-blocks
 sets namespaces arrays cpu.architecture ;
 IN: compiler.cfg.stack-analysis.tests
@@ -25,7 +25,6 @@ IN: compiler.cfg.stack-analysis.tests
     compute-predecessors
     delete-useless-blocks
     delete-useless-conditionals
-    normalize-height
     stack-analysis
     dup check-cfg
     dup check-for-redundant-ops ;
@@ -115,10 +114,11 @@ local-only? off
 ] unit-test
 
 ! Correct height tracking
-[ D 1 D 0 ] [
+[ t ] [
     [ pick [ <array> ] [ drop ] if swap ] test-stack-analysis eliminate-dead-code
     reverse-post-order 2 swap nth
     instructions>> [ ##peek? ] filter first2 [ loc>> ] [ loc>> ] bi*
+    2array { D 1 D 0 } set=
 ] unit-test
 
 [ D 1 ] [