From e6f5eab59847a5566d28254d5aea86afed430162 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 28 Jul 2009 08:47:35 -0500 Subject: [PATCH] compiler.cfg.linear-scan: fix resolve pass --- basis/compiler/cfg/linear-scan/resolve/resolve.factor | 4 ++-- basis/compiler/cfg/parallel-copy/parallel-copy.factor | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/compiler/cfg/linear-scan/resolve/resolve.factor b/basis/compiler/cfg/linear-scan/resolve/resolve.factor index baa5099d8f..932e3dc6d6 100644 --- a/basis/compiler/cfg/linear-scan/resolve/resolve.factor +++ b/basis/compiler/cfg/linear-scan/resolve/resolve.factor @@ -23,7 +23,7 @@ SYMBOL: spill-temps :: resolve-value-data-flow ( bb to vreg -- ) vreg bb vreg-at-end vreg to vreg-at-start - 2dup eq? [ 2drop ] [ vreg reg-class>> add-mapping ] if ; + 2dup = [ 2drop ] [ vreg reg-class>> add-mapping ] if ; : compute-mappings ( bb to -- mappings ) [ @@ -58,7 +58,7 @@ SYMBOL: temp } cond ; : mapping-instructions ( alist -- insns ) - >hashtable + [ swap ] H{ } assoc-map-as [ temp [ swap >insn ] parallel-mapping ] { } make ; : perform-mappings ( bb to mappings -- ) diff --git a/basis/compiler/cfg/parallel-copy/parallel-copy.factor b/basis/compiler/cfg/parallel-copy/parallel-copy.factor index f5abc4be60..5a1bfcd111 100644 --- a/basis/compiler/cfg/parallel-copy/parallel-copy.factor +++ b/basis/compiler/cfg/parallel-copy/parallel-copy.factor @@ -23,7 +23,7 @@ SYMBOLS: temp locs preds to-do ready ; temp set to-do set ready set - [ [ eq? not ] assoc-filter preds set ] + [ preds set ] [ [ nip dup ] H{ } assoc-map-as locs set ] [ keys [ init-to-do ] [ init-ready ] bi ] tri ;