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

cleanup pass didn't properly handle conditionals where both branches were dead

db4
Slava Pestov 2008-11-11 08:38:03 -06:00
parent 43335d9c36
commit 7f9fbdaa4e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/compiler/tree/cleanup/cleanup-tests.factor
View File

@ -500,3 +500,8 @@ cell-bits 32 = [
[ { array-capacity } declare 1 fixnum+ ] cleaned-up-tree [ { array-capacity } declare 1 fixnum+ ] cleaned-up-tree
[ { [ #call? ] [ node-input-infos second literal>> 1 = ] } 1&& ] contains? [ { [ #call? ] [ node-input-infos second literal>> 1 = ] } 1&& ] contains?
] unit-test ] unit-test
[ ] [
[ { null } declare [ 1 ] [ 2 ] if ]
build-tree normalize propagate cleanup check-nodes
] unit-test

2
basis/compiler/tree/cleanup/cleanup.factor
View File

@ -102,7 +102,7 @@ M: #declare cleanup* drop f ;
#! If only one branch is live we don't need to branch at #! If only one branch is live we don't need to branch at
#! all; just drop the condition value. #! all; just drop the condition value.
dup live-children sift dup length { dup live-children sift dup length {
{ 0 [ 2drop f ] } { 0 [ drop in-d>> #drop ] }
{ 1 [ first swap in-d>> #drop prefix ] } { 1 [ first swap in-d>> #drop prefix ] }
[ 2drop ] [ 2drop ]
} case ; } case ;