From 3b5f7a9ecfafbe18926a150b5098f1f439799595 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 16 Jan 2010 20:00:48 +1300 Subject: [PATCH] compiler.tree.propagation: ensure that we don't call 'equal?' or 'hashcode' on literals in words being compiled --- basis/compiler/tree/propagation/info/info.factor | 16 ++++++---------- .../tree/propagation/propagation-tests.factor | 6 ++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/basis/compiler/tree/propagation/info/info.factor b/basis/compiler/tree/propagation/info/info.factor index 6dcf6f7317..28ffb96f8f 100644 --- a/basis/compiler/tree/propagation/info/info.factor +++ b/basis/compiler/tree/propagation/info/info.factor @@ -312,16 +312,12 @@ SYMBOL: value-infos value-info >literal< ; : possible-boolean-values ( info -- values ) - dup literal?>> [ - literal>> 1array - ] [ - class>> { - { [ dup null-class? ] [ { } ] } - { [ dup true-class? ] [ { t } ] } - { [ dup false-class? ] [ { f } ] } - [ { t f } ] - } cond nip - ] if ; + class>> { + { [ dup null-class? ] [ { } ] } + { [ dup true-class? ] [ { t } ] } + { [ dup false-class? ] [ { f } ] } + [ { t f } ] + } cond nip ; : node-value-info ( node value -- info ) swap info>> at* [ drop null-info ] unless ; diff --git a/basis/compiler/tree/propagation/propagation-tests.factor b/basis/compiler/tree/propagation/propagation-tests.factor index 2c80b87e76..ad17ccc1c9 100644 --- a/basis/compiler/tree/propagation/propagation-tests.factor +++ b/basis/compiler/tree/propagation/propagation-tests.factor @@ -946,3 +946,9 @@ M: tuple-with-read-only-slot clone [ t ] [ [ { float float } declare max ] { max } inlined? ] unit-test [ f ] [ [ { float float } declare max ] { float-max } inlined? ] unit-test + +! Propagation should not call equal?, hashcode, etc on literals in user code +[ V{ } ] [ [ 4 [ 2drop ] with each ] final-info ] unit-test + +! Reduction +[ 1 ] [ [ 4 [ nth-unsafe ] [ ] unless ] final-info length ] unit-test