From 687454878a75fc0b0ee1b090ce1db94dffdb8b91 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 8 Aug 2009 23:06:57 -0500 Subject: [PATCH] compiler.cfg.linearization: change order to fit older unit tests --- basis/compiler/cfg/linear-scan/resolve/resolve.factor | 3 +++ basis/compiler/cfg/linearization/order/order.factor | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/basis/compiler/cfg/linear-scan/resolve/resolve.factor b/basis/compiler/cfg/linear-scan/resolve/resolve.factor index a3733b5d98..b45e2c9597 100644 --- a/basis/compiler/cfg/linear-scan/resolve/resolve.factor +++ b/basis/compiler/cfg/linear-scan/resolve/resolve.factor @@ -9,6 +9,7 @@ compiler.cfg.liveness compiler.cfg.registers compiler.cfg.utilities compiler.cfg.instructions +compiler.cfg.predecessors compiler.cfg.parallel-copy compiler.cfg.linear-scan.assignment compiler.cfg.linear-scan.allocation.state ; @@ -75,5 +76,7 @@ SYMBOL: temp dup successors>> [ resolve-edge-data-flow ] with each ; : resolve-data-flow ( cfg -- ) + needs-predecessors + H{ } clone spill-temps set [ resolve-block-data-flow ] each-basic-block ; diff --git a/basis/compiler/cfg/linearization/order/order.factor b/basis/compiler/cfg/linearization/order/order.factor index 2e91184fe5..703db8e516 100644 --- a/basis/compiler/cfg/linearization/order/order.factor +++ b/basis/compiler/cfg/linearization/order/order.factor @@ -53,7 +53,7 @@ SYMBOLS: work-list loop-heads visited ; ] [ drop ] if ; : sorted-successors ( bb -- seq ) - successors>> [ loop-nesting-at ] sort-with ; + successors>> [ loop-nesting-at ] sort-with ; : process-block ( bb -- ) [ , ]