6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 02:29:22 +00:00
Code Issues Projects Releases Wiki Activity

LSR fix: add a missing phi check during IV hoisting.

Browse Source 
Fixes PR12898: SCEVExpander crash.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157263 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Trick 2012-05-22 17:39:59 +00:00
parent 5c525b59d5
commit 3de8ad8bf9
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Analysis/ScalarEvolutionExpander.cpp
View File

@ -955,7 +955,8 @@ bool SCEVExpander::hoistIVInc(Instruction *IncV, Instruction *InsertPos) {
// InsertPos must itself dominate IncV so that IncV's new position satisfies
// its existing users.
if (!SE.DT->dominates(InsertPos->getParent(), IncV->getParent()))
if (isa<PHINode>(InsertPos)
|| !SE.DT->dominates(InsertPos->getParent(), IncV->getParent()))
return false;
// Check that the chain of IV operands leading back to Phi can be hoisted.

57
test/Transforms/LoopStrengthReduce/X86/2012-01-13-phielim.ll
View File

@ -90,3 +90,60 @@ for.inc498: ; preds = %for.inc498, %for.bo
while.end: ; preds = %entry
ret void
}
; PR12898: SCEVExpander crash
; Test redundant phi elimination when the deleted phi's increment is
; itself a phi.
;
; CHECK: @test3
; CHECK: %for.body3.lr.ph.us.i.loopexit
; CHECK-NEXT: in Loop: Header
; CHECK-NEXT: incq
; CHECK-NEXT: .align
; CHECK-NEXT: %for.body3.us.i
; CHECK-NEXT: Inner Loop
; CHECK: testb
; CHECK: jne
; CHECK: jmp
define fastcc void @test3(double* nocapture %u) nounwind uwtable ssp {
entry:
br i1 undef, label %meshBB1, label %meshBB5
for.inc8.us.i: ; preds = %for.body3.us.i
br i1 undef, label %meshBB1, label %meshBB
for.body3.us.i: ; preds = %meshBB, %for.body3.lr.ph.us.i
%indvars.iv.i.SV.phi = phi i64 [ %indvars.iv.next.i, %meshBB ], [ 0, %for.body3.lr.ph.us.i ]
%storemerge13.us.i.SV.phi = phi i32 [ 0, %meshBB ], [ 0, %for.body3.lr.ph.us.i ]
%Opq.sa.calc12 = sub i32 undef, 227
%0 = add nsw i64 %indvars.iv.i.SV.phi, %indvars.iv8.i.SV.phi26
%1 = trunc i64 %0 to i32
%mul.i.us.i = mul nsw i32 0, %1
%arrayidx5.us.i = getelementptr inbounds double* %u, i64 %indvars.iv.i.SV.phi
%2 = load double* %arrayidx5.us.i, align 8
%indvars.iv.next.i = add i64 %indvars.iv.i.SV.phi, 1
br i1 undef, label %for.inc8.us.i, label %meshBB
for.body3.lr.ph.us.i: ; preds = %meshBB1, %meshBB
%indvars.iv8.i.SV.phi26 = phi i64 [ undef, %meshBB1 ], [ %indvars.iv8.i.SV.phi24, %meshBB ]
%arrayidx.us.i = getelementptr inbounds double* undef, i64 %indvars.iv8.i.SV.phi26
%3 = add i64 %indvars.iv8.i.SV.phi26, 1
br label %for.body3.us.i
for.inc8.us.i2: ; preds = %meshBB5
unreachable
eval_At_times_u.exit: ; preds = %meshBB5
ret void
meshBB: ; preds = %for.body3.us.i, %for.inc8.us.i
%indvars.iv8.i.SV.phi24 = phi i64 [ undef, %for.body3.us.i ], [ %3, %for.inc8.us.i ]
%meshStackVariable.phi = phi i32 [ %Opq.sa.calc12, %for.body3.us.i ], [ undef, %for.inc8.us.i ]
br i1 undef, label %for.body3.lr.ph.us.i, label %for.body3.us.i
meshBB1: ; preds = %for.inc8.us.i, %entry
br label %for.body3.lr.ph.us.i
meshBB5: ; preds = %entry
br i1 undef, label %eval_At_times_u.exit, label %for.inc8.us.i2
}