RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-03 08:11:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PruneEH] FuncletPads must not have undef operands

Browse Source 
Instead of RAUW with undef, replace the first non-token instruction with
unreachable.

This fixes PR26263.

llvm-svn: 258611
This commit is contained in:
David Majnemer 2016-01-23 05:41:29 +00:00
parent 09858a3961
commit 7a3addc91c
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Transforms/IPO/PruneEH.cpp
View File

@ -228,10 +228,17 @@ void PruneEH::DeleteBasicBlock(BasicBlock *BB) {
assert(pred_empty(BB) && "BB is not dead!"); assert(pred_empty(BB) && "BB is not dead!");
CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph(); CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph();
Instruction *TokenInst = nullptr;
CallGraphNode *CGN = CG[BB->getParent()]; CallGraphNode *CGN = CG[BB->getParent()];
for (BasicBlock::iterator I = BB->end(), E = BB->begin(); I != E; ) { for (BasicBlock::iterator I = BB->end(), E = BB->begin(); I != E; ) {
--I; --I;
if (I->getType()->isTokenTy()) {
TokenInst = &*I;
break;
}
if (auto CS = CallSite (&*I)) { if (auto CS = CallSite (&*I)) {
const Function *Callee = CS.getCalledFunction(); const Function *Callee = CS.getCalledFunction();
if (!Callee || !Intrinsic::isLeaf(Callee->getIntrinsicID())) if (!Callee || !Intrinsic::isLeaf(Callee->getIntrinsicID()))
@ -244,11 +251,15 @@ void PruneEH::DeleteBasicBlock(BasicBlock *BB) {
I->replaceAllUsesWith(UndefValue::get(I->getType())); I->replaceAllUsesWith(UndefValue::get(I->getType()));
} }
// Get the list of successors of this block. if (TokenInst) {
std::vector<BasicBlock*> Succs(succ_begin(BB), succ_end(BB)); changeToUnreachable(TokenInst->getNextNode(), /*UseLLVMTrap=*/false);
} else {
// Get the list of successors of this block.
std::vector<BasicBlock *> Succs(succ_begin(BB), succ_end(BB));
for (unsigned i = 0, e = Succs.size(); i != e; ++i) for (unsigned i = 0, e = Succs.size(); i != e; ++i)
Succs[i]->removePredecessor(BB); Succs[i]->removePredecessor(BB);
BB->eraseFromParent(); BB->eraseFromParent();
}
} }

30
test/Transforms/PruneEH/pr26263.ll Normal file
View File

@ -0,0 +1,30 @@
; RUN: opt -prune-eh -S < %s | FileCheck %s
target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
target triple = "i386-pc-windows-msvc"
declare void @neverthrows() nounwind
define void @test1() personality i32 (...)* @__CxxFrameHandler3 {
invoke void @neverthrows()
to label %try.cont unwind label %cleanuppad
try.cont:
ret void
cleanuppad:
%cp = cleanuppad within none []
br label %cleanupret
cleanupret:
cleanupret from %cp unwind to caller
}
; CHECK-LABEL: define void @test1(
; CHECK: call void @neverthrows()
; CHECK: %[[cp:.*]] = cleanuppad within none []
; CHECK-NEXT: unreachable
; CHECK: cleanupret from %[[cp]] unwind to caller
declare i32 @__CxxFrameHandler3(...)