From 248730d39f9859ab0888528d4f49328648641923 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Wed, 17 Mar 2010 20:12:10 -0400 Subject: [PATCH] Cleaning up compiler.cfg.ssa.construction --- basis/compiler/cfg/ssa/construction/construction.factor | 2 +- basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/basis/compiler/cfg/ssa/construction/construction.factor b/basis/compiler/cfg/ssa/construction/construction.factor index 7cd85e5fbe..03c85c1f5e 100644 --- a/basis/compiler/cfg/ssa/construction/construction.factor +++ b/basis/compiler/cfg/ssa/construction/construction.factor @@ -57,7 +57,7 @@ SYMBOL: inserting-phi-nodes ] [ 2drop ] if ; : compute-phi-nodes-for ( vreg bbs -- ) - keys [ insert-phi-node-later ] with merge-set-each ; + keys merge-set [ insert-phi-node-later ] with each ; : compute-phi-nodes ( -- ) H{ } clone inserting-phi-nodes set diff --git a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor index 51eb3c8a98..4cdc290c41 100644 --- a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor +++ b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor @@ -88,7 +88,6 @@ PRIVATE> : compute-merge-sets ( cfg -- ) needs-dominance - HS{ } clone visited set [ compute-levels ] [ init-merge-sets ] [ compute-merge-set-loop ] @@ -96,6 +95,3 @@ PRIVATE> : merge-set ( bbs -- bbs' ) (merge-set) [ members ] dip nths ; - -: merge-set-each ( bbs quot: ( bb -- ) -- ) - [ merge-set ] dip each ; inline