From 1e5ce413647e9bddbe8b031dacc45fe17d570347 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 22 Jul 2009 03:26:27 -0500 Subject: [PATCH] Fix bootstrap --- basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor | 4 ++-- basis/compiler/cfg/dcn/dcn-tests.factor | 1 - basis/compiler/cfg/dcn/global/global.factor | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor index c38f43da8a..975adfa6cb 100644 --- a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor +++ b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor @@ -20,7 +20,7 @@ MIXIN: dataflow-analysis GENERIC# compute-in-set 2 ( bb out-sets dfa -- set ) -! M: kill-block compute-in-set 3drop f ; +M: kill-block compute-in-set 3drop f ; M:: basic-block compute-in-set ( bb out-sets dfa -- set ) bb dfa predecessors [ out-sets at ] map dfa join-sets ; @@ -31,7 +31,7 @@ M:: basic-block compute-in-set ( bb out-sets dfa -- set ) GENERIC# compute-out-set 2 ( bb out-sets dfa -- set ) -! M: kill-block compute-out-set 3drop f ; +M: kill-block compute-out-set 3drop f ; M:: basic-block compute-out-set ( bb in-sets dfa -- set ) bb in-sets at bb dfa transfer-set ; diff --git a/basis/compiler/cfg/dcn/dcn-tests.factor b/basis/compiler/cfg/dcn/dcn-tests.factor index 43a66a8012..3dfaa665aa 100644 --- a/basis/compiler/cfg/dcn/dcn-tests.factor +++ b/basis/compiler/cfg/dcn/dcn-tests.factor @@ -13,7 +13,6 @@ compiler.cfg.dcn.height compiler.cfg.dcn.local compiler.cfg.dcn.local.private compiler.cfg.dcn.global -compiler.cfg.dcn.global.private compiler.cfg.dcn.rewrite ; : test-local-dcn ( insns -- insns' ) diff --git a/basis/compiler/cfg/dcn/global/global.factor b/basis/compiler/cfg/dcn/global/global.factor index 44f8af24cc..21a795151a 100644 --- a/basis/compiler/cfg/dcn/global/global.factor +++ b/basis/compiler/cfg/dcn/global/global.factor @@ -4,8 +4,6 @@ USING: assocs kernel combinators compiler.cfg.dataflow-analysis compiler.cfg.dcn.local ; IN: compiler.cfg.dcn.global - - ! Main word : compute-global-sets ( cfg -- ) {