From 783d0fcabf62786a4f1f6246a61340ee8b1cae24 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 29 Aug 2008 04:40:53 -0500 Subject: [PATCH] Fix cleanup of conditionals with no live branches --- basis/compiler/tree/cleanup/cleanup.factor | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/basis/compiler/tree/cleanup/cleanup.factor b/basis/compiler/tree/cleanup/cleanup.factor index 501507bc56..c62c12eeef 100644 --- a/basis/compiler/tree/cleanup/cleanup.factor +++ b/basis/compiler/tree/cleanup/cleanup.factor @@ -102,8 +102,11 @@ M: #declare cleanup* drop f ; : fold-only-branch ( #branch -- node/nodes ) #! If only one branch is live we don't need to branch at #! all; just drop the condition value. - dup live-children sift dup length 1 = - [ first swap in-d>> #drop prefix ] [ drop ] if ; + dup live-children sift dup length { + { 0 [ 2drop f ] } + { 1 [ first swap in-d>> #drop prefix ] } + [ 2drop ] + } case ; SYMBOL: live-branches @@ -118,15 +121,18 @@ M: #branch cleanup* [ live-branches>> live-branches set ] } cleave ; +: output-fs ( values -- nodes ) + [ f swap #push ] map ; + : eliminate-single-phi ( #phi -- node ) [ phi-in-d>> first ] [ out-d>> ] bi over [ +bottom+ eq? ] all? - [ [ drop ] [ [ f swap #push ] map ] bi* ] + [ [ drop ] [ output-fs ] bi* ] [ #copy ] if ; : eliminate-phi ( #phi -- node ) live-branches get sift length { - { 0 [ drop f ] } + { 0 [ out-d>> output-fs ] } { 1 [ eliminate-single-phi ] } [ drop ] } case ;