diff options
| -rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 13 | ||||
| -rw-r--r-- | lib/Transforms/Utils/SimplifyCFG.cpp | 10 | ||||
| -rw-r--r-- | test/Transforms/Inline/unwindto.ll | 13 | ||||
| -rw-r--r-- | test/Transforms/SimplifyCFG/unwindto.ll | 35 |
4 files changed, 70 insertions, 1 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 64e6056b73..9ccc918aca 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -202,6 +202,7 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { BasicBlock *OrigBB = TheCall->getParent(); Function *Caller = OrigBB->getParent(); + BasicBlock *UnwindBB = OrigBB->getUnwindDest(); // GC poses two hazards to inlining, which only occur when the callee has GC: // 1. If the caller has no GC, then the callee's GC must be propagated to the @@ -419,6 +420,18 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { } } + // If we are inlining a function that unwinds into a BB with an unwind dest, + // turn the inlined unwinds into branches to the unwind dest. + if (InlinedFunctionInfo.ContainsUnwinds && UnwindBB && isa<CallInst>(TheCall)) + for (Function::iterator BB = FirstNewBlock, E = Caller->end(); + BB != E; ++BB) { + TerminatorInst *Term = BB->getTerminator(); + if (isa<UnwindInst>(Term)) { + new BranchInst(UnwindBB, Term); + BB->getInstList().erase(Term); + } + } + // If we are inlining for an invoke instruction, we must make sure to rewrite // any inlined 'unwind' instructions into branches to the invoke exception // destination, and call instructions into invoke instructions. diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 2092c8b58a..61da0d998f 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1237,6 +1237,8 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { SmallVector<BasicBlock*, 8> UncondBranchPreds; SmallVector<BranchInst*, 8> CondBranchPreds; for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI) { + if ((*PI)->getUnwindDest() == BB) continue; + TerminatorInst *PTI = (*PI)->getTerminator(); if (BranchInst *BI = dyn_cast<BranchInst>(PTI)) { if (BI->isUnconditional()) @@ -1788,6 +1790,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { BasicBlock *OnlySucc = 0; if (OnlyPred && OnlyPred != BB && // Don't break self loops + OnlyPred->getUnwindDest() != BB && OnlyPred->getTerminator()->getOpcode() != Instruction::Invoke) { // Check to see if there is only one distinct successor... succ_iterator SI(succ_begin(OnlyPred)), SE(succ_end(OnlyPred)); @@ -1799,7 +1802,8 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { } } - if (OnlySucc) { + if (OnlySucc && (BB->getUnwindDest() == OnlyPred->getUnwindDest() || + !BB->getUnwindDest() || !OnlyPred->getUnwindDest())) { DOUT << "Merging: " << *BB << "into: " << *OnlyPred; // Resolve any PHI nodes at the start of the block. They are all @@ -1819,6 +1823,10 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { // Move all definitions in the successor to the predecessor. OnlyPred->getInstList().splice(OnlyPred->end(), BB->getInstList()); + // Move the unwind_to block + if (!OnlyPred->getUnwindDest() && BB->getUnwindDest()) + OnlyPred->setUnwindDest(BB->getUnwindDest()); + // Make all PHI nodes that referred to BB now refer to Pred as their // source. BB->replaceAllUsesWith(OnlyPred); diff --git a/test/Transforms/Inline/unwindto.ll b/test/Transforms/Inline/unwindto.ll new file mode 100644 index 0000000000..28e857d2f9 --- /dev/null +++ b/test/Transforms/Inline/unwindto.ll @@ -0,0 +1,13 @@ +; RUN: llvm-as < %s | opt -inline | llvm-dis | grep "br label %cleanup" + +define void @g() { + unwind +} + +define i32 @f1() { +entry: unwind_to %cleanup + call void @g() + ret i32 0 +cleanup: + ret i32 1 +} diff --git a/test/Transforms/SimplifyCFG/unwindto.ll b/test/Transforms/SimplifyCFG/unwindto.ll new file mode 100644 index 0000000000..e42a831766 --- /dev/null +++ b/test/Transforms/SimplifyCFG/unwindto.ll @@ -0,0 +1,35 @@ +; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep unwind_to | count 3 + +declare void @g(i32) + +define i32 @f1() { +entry: + br label %bb1 +bb1: unwind_to %cleanup1 + call void @g(i32 0) + br label %bb2 +bb2: unwind_to %cleanup2 + call void @g(i32 1) + br label %exit +exit: + ret i32 0 +cleanup1: + ret i32 1 +cleanup2: + ret i32 2 +} + +define i32 @f2() { +entry: unwind_to %cleanup + br label %bb1 +bb1: unwind_to %cleanup + br label %bb2 +bb2: unwind_to %cleanup + br label %bb3 +bb3: + br label %bb4 +bb4: unwind_to %cleanup + ret i32 0 +cleanup: + ret i32 1 +} |