Cleaning up compiler.cfg.ssa.construction

diff --git a/basis/compiler/cfg/ssa/construction/construction.factor b/basis/compiler/cfg/ssa/construction/construction.factor
index 7cd85e5fbebd4431746322aa0e2f7ea748f13889..03c85c1f5e18c79220826523ea987bff46135fe4 100644 (file)
--- 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 51eb3c8a98e09006cc41b95eb4eb920dc963c0db..4cdc290c41569588420117d878c868ef09f5805e 100644 (file)
--- 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