maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[InstCombine] Don't insert an instruction after a terminator 

We tried to insert a cast of a phi in a block whose terminator is an
EHPad.  This is invalid.  Do not attempt the transform in these
circumstances.

llvm-svn: 252370
This commit is contained in:
David Majnemer 2015-11-06 23:59:23 +00:00
parent c866762272
commit 27f2447fb3
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
View File

@ -469,6 +469,12 @@ Instruction *InstCombiner::FoldPHIArgZextsIntoPHI(PHINode &Phi) {
/// only used by the PHI, PHI together their inputs, and do the operation once,
/// to the result of the PHI.
Instruction *InstCombiner::FoldPHIArgOpIntoPHI(PHINode &PN) {
// We cannot create a new instruction after the PHI if the terminator is an
// EHPad because there is no valid insertion point.
if (TerminatorInst *TI = PN.getParent()->getTerminator())
if (TI->isEHPad())
return nullptr;
Instruction *FirstInst = cast<Instruction>(PN.getIncomingValue(0));
if (isa<GetElementPtrInst>(FirstInst))

40
llvm/test/Transforms/InstCombine/token.ll
View File

@ -4,7 +4,7 @@ target triple = "x86_64-pc-windows-msvc18.0.0"
declare i32 @__CxxFrameHandler3(...)
define i8* @f() personality i32 (...)* @__CxxFrameHandler3 {
define void @test1() personality i32 (...)* @__CxxFrameHandler3 {
bb:
unreachable
@ -13,9 +13,45 @@ unreachable:
cleanupret %cl unwind to caller
}
; CHECK-LABEL: define void @test1(
; CHECK: unreachable:
; CHECK: %cl = cleanuppad []
; CHECK: cleanupret %cl unwind to caller
define void @test2(i8 %A, i8 %B) personality i32 (...)* @__CxxFrameHandler3 {
bb:
%X = zext i8 %A to i32
invoke void @g(i32 0)
to label %cont
unwind label %catch
declare void @g(i8*)
cont:
%Y = zext i8 %B to i32
invoke void @g(i32 0)
to label %unreachable
unwind label %catch
catch:
%phi = phi i32 [ %X, %bb ], [ %Y, %cont ]
%cl = catchpad []
to label %doit
unwind label %endpad
doit:
call void @g(i32 %phi)
unreachable
unreachable:
unreachable
endpad:
catchendpad unwind to caller
}
; CHECK-LABEL: define void @test2(
; CHECK: %X = zext i8 %A to i32
; CHECK: %Y = zext i8 %B to i32
; CHECK: %phi = phi i32 [ %X, %bb ], [ %Y, %cont ]
declare void @g(i32)