From 08e9f18c3b2d5e88c8b00d88f02a1de394da2e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Thu, 11 Dec 2014 02:36:37 +0100
Subject: [PATCH] compiler.cfg.*: fix for test cases that broke due to stack
 effect changes

---
 basis/compiler/cfg/copy-prop/copy-prop-tests.factor       | 2 +-
 basis/compiler/cfg/dce/dce-tests.factor                   | 2 +-
 .../cfg/value-numbering/value-numbering-tests.factor      | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/basis/compiler/cfg/copy-prop/copy-prop-tests.factor b/basis/compiler/cfg/copy-prop/copy-prop-tests.factor
index 5f5d05560c..2e4fd73a4d 100644
--- a/basis/compiler/cfg/copy-prop/copy-prop-tests.factor
+++ b/basis/compiler/cfg/copy-prop/copy-prop-tests.factor
@@ -4,7 +4,7 @@ cpu.architecture kernel namespaces tools.test ;
 IN: compiler.cfg.copy-prop.tests
 
 : test-copy-propagation ( -- )
-    0 get block>cfg copy-propagation drop ;
+    0 get block>cfg copy-propagation ;
 
 ! Simple example
 V{
diff --git a/basis/compiler/cfg/dce/dce-tests.factor b/basis/compiler/cfg/dce/dce-tests.factor
index 4262bce738..53f25a4377 100644
--- a/basis/compiler/cfg/dce/dce-tests.factor
+++ b/basis/compiler/cfg/dce/dce-tests.factor
@@ -5,7 +5,7 @@ compiler.cfg.registers compiler.cfg.utilities cpu.architecture tools.test ;
 IN: compiler.cfg.dce.tests
 
 : test-dce ( insns -- insns' )
-    insns>cfg eliminate-dead-code entry>> instructions>> ;
+    insns>cfg dup eliminate-dead-code entry>> instructions>> ;
 
 [ V{
     T{ ##load-integer { dst 1 } { val 8 } }
diff --git a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
index 84f398a7b0..202ee4416a 100644
--- a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
+++ b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
@@ -2748,7 +2748,7 @@ test-diamond
 
 [ ] [
     0 get block>cfg dup cfg set
-    value-numbering
+    dup value-numbering
     select-representations
     destruct-ssa drop
 ] unit-test
@@ -2788,9 +2788,7 @@ test-diamond
 
 [ ] [
     0 get block>cfg
-    value-numbering
-    eliminate-dead-code
-    drop
+    { value-numbering eliminate-dead-code } apply-passes
 ] unit-test
 
 [ t ] [ 1 get successors>> first 3 get eq? ] unit-test
@@ -2857,7 +2855,7 @@ V{
 
 [ ] [
     0 get block>cfg
-    value-numbering eliminate-dead-code drop
+    { value-numbering eliminate-dead-code } apply-passes
 ] unit-test
 
 [ f ] [ 1 get instructions>> [ ##peek? ] any? ] unit-test