From 1e5f202998efbd3af094a66d01d1077292fb06a3 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 28 Feb 2010 22:55:22 -0500 Subject: [PATCH] Maing vocabs.hierarchy use sets; modifying alias analysis's use of sets --- basis/compiler/cfg/alias-analysis/alias-analysis.factor | 2 +- basis/vocabs/hierarchy/hierarchy.factor | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/compiler/cfg/alias-analysis/alias-analysis.factor b/basis/compiler/cfg/alias-analysis/alias-analysis.factor index 23e46f169b..24433ad594 100644 --- a/basis/compiler/cfg/alias-analysis/alias-analysis.factor +++ b/basis/compiler/cfg/alias-analysis/alias-analysis.factor @@ -298,7 +298,7 @@ SYMBOL: live-stores histories get values [ values [ [ store? ] filter [ insn#>> ] map ] map concat - ] map concat HS{ } set-like + ] map concat fast-set live-stores set ; GENERIC: eliminate-dead-stores* ( insn -- insn' ) diff --git a/basis/vocabs/hierarchy/hierarchy.factor b/basis/vocabs/hierarchy/hierarchy.factor index b840b5ab9d..986091a543 100644 --- a/basis/vocabs/hierarchy/hierarchy.factor +++ b/basis/vocabs/hierarchy/hierarchy.factor @@ -65,8 +65,8 @@ PRIVATE> #! Hack. [ vocab-prefix? ] partition [ - [ vocab-name ] map unique - '[ name>> _ key? not ] filter + [ vocab-name ] map fast-set + '[ name>> _ in? not ] filter convert-prefixes ] keep append ;