steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix escape analysis bug reported by Doug

db4
Slava Pestov 2009-05-15 17:18:38 -05:00
parent b62630b5ac
commit dedbd14945
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/compiler/tree/escape-analysis/escape-analysis-tests.factor
View File

@ -322,3 +322,9 @@ C: <ro-box> ro-box
[ 0 ] [ [ 0 ] [
[ { null } declare [ 1 ] [ 2 ] if ] count-unboxed-allocations [ { null } declare [ 1 ] [ 2 ] if ] count-unboxed-allocations
] unit-test ] unit-test
! Doug found a regression
TUPLE: empty-tuple ;
[ ] [ [ empty-tuple boa layout-of ] count-unboxed-allocations drop ] unit-test

12
basis/compiler/tree/escape-analysis/simple/simple.factor
View File

@ -49,14 +49,10 @@ M: #push escape-analysis*
: slot-offset ( #call -- n/f ) : slot-offset ( #call -- n/f )
dup in-d>> dup in-d>>
[ first node-value-info class>> ] [ second node-value-info literal>> ]
[ second node-value-info literal>> ] 2bi [ first node-value-info class>> ] 2bi
dup fixnum? [ 2dup [ fixnum? ] [ tuple class<= ] bi* and [
{ over 2 >= [ drop 2 - ] [ 2drop f ] if
{ [ over tuple class<= ] [ 2 - ] }
{ [ over complex class<= ] [ 1 - ] }
[ drop f ]
} cond nip
] [ 2drop f ] if ; ] [ 2drop f ] if ;
: record-slot-call ( #call -- ) : record-slot-call ( #call -- )