diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor index b251578bc8..535dc6db86 100644 --- a/basis/compiler/cfg/ssa/destruction/destruction.factor +++ b/basis/compiler/cfg/ssa/destruction/destruction.factor @@ -8,7 +8,7 @@ compiler.cfg.def-use compiler.cfg.renaming compiler.cfg.dominance compiler.cfg.instructions -compiler.cfg.liveness.ssa +compiler.cfg.ssa.liveness compiler.cfg.ssa.cssa compiler.cfg.ssa.interference compiler.cfg.ssa.interference.live-ranges @@ -97,11 +97,11 @@ M: insn prepare-insn drop ; : destruct-ssa ( cfg -- cfg' ) dup cfg-has-phis? [ dup construct-cssa - compute-ssa-live-sets + dup precompute-liveness dup compute-defs dup compute-dominance dup compute-live-ranges dup prepare-coalescing process-copies dup perform-renaming - ] when ; \ No newline at end of file + ] when ; diff --git a/basis/compiler/cfg/ssa/interference/interference-tests.factor b/basis/compiler/cfg/ssa/interference/interference-tests.factor index f8876755d9..9075d3b010 100644 --- a/basis/compiler/cfg/ssa/interference/interference-tests.factor +++ b/basis/compiler/cfg/ssa/interference/interference-tests.factor @@ -1,6 +1,6 @@ USING: accessors compiler.cfg compiler.cfg.debugger compiler.cfg.def-use compiler.cfg.dominance -compiler.cfg.instructions compiler.cfg.liveness.ssa +compiler.cfg.instructions compiler.cfg.ssa.liveness compiler.cfg.registers compiler.cfg.predecessors compiler.cfg.ssa.interference compiler.cfg.ssa.interference.live-ranges cpu.architecture @@ -9,8 +9,8 @@ IN: compiler.cfg.ssa.interference.tests : test-interference ( -- ) cfg new 0 get >>entry - compute-ssa-live-sets compute-predecessors + dup precompute-liveness dup compute-defs dup compute-dominance compute-live-ranges ; @@ -49,4 +49,4 @@ V{ [ t ] [ V int-regs 3 V int-regs 5 vregs-interfere? ] unit-test [ t ] [ V int-regs 5 V int-regs 3 vregs-interfere? ] unit-test [ f ] [ V int-regs 3 V int-regs 6 vregs-interfere? ] unit-test -[ f ] [ V int-regs 6 V int-regs 3 vregs-interfere? ] unit-test \ No newline at end of file +[ f ] [ V int-regs 6 V int-regs 3 vregs-interfere? ] unit-test diff --git a/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor index 151af8bea4..c29b69cf36 100644 --- a/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor +++ b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs fry kernel namespaces sequences math arrays compiler.cfg.def-use compiler.cfg.instructions -compiler.cfg.liveness.ssa compiler.cfg.rpo ; +compiler.cfg.ssa.liveness compiler.cfg.rpo ; IN: compiler.cfg.ssa.interference.live-ranges ! Live ranges for interference testing