diff options
Diffstat (limited to 'lib/Transforms/Utils/InlineFunction.cpp')
| -rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index a96c7ceaa8..9cd38cc55e 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -235,7 +235,7 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { // function. std::vector<ReturnInst*> Returns; ClonedCodeInfo InlinedFunctionInfo; - Function::iterator FirstNewBlock; + Function::iterator FirstNewBlock, LastNewBlock; { // Scope to destroy ValueMap after cloning. DenseMap<const Value*, Value*> ValueMap; @@ -312,6 +312,7 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { // Remember the first block that is newly cloned over. FirstNewBlock = LastBlock; ++FirstNewBlock; + LastNewBlock = &Caller->back(); // Update the callgraph if requested. if (CG) @@ -537,7 +538,9 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { // Add a branch to the merge points and remove return instructions. for (unsigned i = 0, e = Returns.size(); i != e; ++i) { ReturnInst *RI = Returns[i]; - BranchInst::Create(AfterCallBB, RI); + // A return in the last block in the function falls through. +// if (isa<InvokeInst>(TheCall) || RI->getParent() != LastNewBlock) + BranchInst::Create(AfterCallBB, RI); RI->eraseFromParent(); } } else if (!Returns.empty()) { |