Update the inliner and simplifycfg to handle unwind_to.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48086 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky
2008-03-09 05:10:13 +00:00
parent c6694228fa
commit 6af31aab63
4 changed files with 70 additions and 1 deletions

View File

@ -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.