6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

[InstCombine] Do not insert a GEP instruction before a landingpad instruction.

Browse Source 
InstCombiner::visitGetElementPtrInst was using getFirstNonPHI to compute the
insertion point, which caused the verifier to complain when a GEP was inserted
before a landingpad instruction. This commit fixes it to use getFirstInsertionPt
instead.

rdar://problem/19394964


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229619 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Akira Hatanaka 2015-02-18 03:30:11 +00:00
parent 8a85dee989
commit 5506e22865
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Transforms/InstCombine/InstructionCombining.cpp
View File

@ -1391,8 +1391,8 @@ Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) {
if (DI == -1) { if (DI == -1) {
// All the GEPs feeding the PHI are identical. Clone one down into our // All the GEPs feeding the PHI are identical. Clone one down into our
// BB so that it can be merged with the current GEP. // BB so that it can be merged with the current GEP.
GEP.getParent()->getInstList().insert(GEP.getParent()->getFirstNonPHI(), GEP.getParent()->getInstList().insert(
NewGEP); GEP.getParent()->getFirstInsertionPt(), NewGEP);
} else { } else {
// All the GEPs feeding the PHI differ at a single offset. Clone a GEP // All the GEPs feeding the PHI differ at a single offset. Clone a GEP
// into the current block so it can be merged, and create a new PHI to // into the current block so it can be merged, and create a new PHI to
@ -1408,8 +1408,8 @@ Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) {
PN->getIncomingBlock(I)); PN->getIncomingBlock(I));
NewGEP->setOperand(DI, NewPN); NewGEP->setOperand(DI, NewPN);
GEP.getParent()->getInstList().insert(GEP.getParent()->getFirstNonPHI(), GEP.getParent()->getInstList().insert(
NewGEP); GEP.getParent()->getFirstInsertionPt(), NewGEP);
NewGEP->setOperand(DI, NewPN); NewGEP->setOperand(DI, NewPN);
} }

44
test/Transforms/InstCombine/gepphigep.ll
View File

@ -2,6 +2,8 @@
%struct1 = type { %struct2*, i32, i32, i32 } %struct1 = type { %struct2*, i32, i32, i32 }
%struct2 = type { i32, i32 } %struct2 = type { i32, i32 }
%struct3 = type { i32, %struct4, %struct4 }
%struct4 = type { %struct2, %struct2 }
define i32 @test1(%struct1* %dm, i1 %tmp4, i64 %tmp9, i64 %tmp19) { define i32 @test1(%struct1* %dm, i1 %tmp4, i64 %tmp9, i64 %tmp19) {
bb: bb:
@ -54,3 +56,45 @@ bb:
; CHECK: getelementptr inbounds %struct2* %tmp1, i64 %tmp19, i32 0 ; CHECK: getelementptr inbounds %struct2* %tmp1, i64 %tmp19, i32 0
; CHECK: getelementptr inbounds %struct2* %tmp1, i64 %tmp9, i32 1 ; CHECK: getelementptr inbounds %struct2* %tmp1, i64 %tmp9, i32 1
} }
; Check that instcombine doesn't insert GEPs before landingpad.
define i32 @test3(%struct3* %dm, i1 %tmp4, i64 %tmp9, i64 %tmp19, i64 %tmp20, i64 %tmp21) {
bb:
%tmp = getelementptr inbounds %struct3* %dm, i64 0
br i1 %tmp4, label %bb1, label %bb2
bb1:
%tmp1 = getelementptr inbounds %struct3* %tmp, i64 %tmp19, i32 1
%tmp11 = getelementptr inbounds %struct4* %tmp1, i64 0, i32 0, i32 0
store i32 0, i32* %tmp11, align 4
br label %bb3
bb2:
%tmp2 = getelementptr inbounds %struct3* %tmp, i64 %tmp20, i32 1
%tmp12 = getelementptr inbounds %struct4* %tmp2, i64 0, i32 0, i32 1
store i32 0, i32* %tmp12, align 4
br label %bb3
bb3:
%phi = phi %struct4* [ %tmp1, %bb1 ], [ %tmp2, %bb2 ]
%tmp22 = invoke i32 @foo1(i32 11) to label %bb4 unwind label %bb5
bb4:
ret i32 0
bb5:
%tmp27 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) catch i8* bitcast (i8** @_ZTIi to i8*)
%tmp34 = getelementptr inbounds %struct4* %phi, i64 %tmp21, i32 1
%tmp35 = getelementptr inbounds %struct2* %tmp34, i64 0, i32 1
%tmp25 = load i32* %tmp35, align 4
ret i32 %tmp25
; CHECK-LABEL: @test3(
; CHECK: bb5:
; CHECK-NEXT: {{.*}}landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
}
@_ZTIi = external constant i8*
declare i32 @__gxx_personality_v0(...)
declare i32 @foo1(i32)