diff options
Diffstat (limited to 'lib/Transforms/Utils/InlineFunction.cpp')
-rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 0d7dcc3426..51fbd14ebf 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -304,14 +304,15 @@ bool llvm::InlineFunction(CallSite CS) { // Splice the code from the return block into the block that it will return // to, which contains the code that was after the call. BasicBlock *ReturnBB = Returns[0]->getParent(); - ReturnBB->getInstList().splice(Returns[0], AfterCallBB->getInstList()); + AfterCallBB->getInstList().splice(AfterCallBB->begin(), + ReturnBB->getInstList()); - // Update PHI nodes that use the AfterCallBB to use the ReturnBB. - AfterCallBB->replaceAllUsesWith(ReturnBB); + // Update PHI nodes that use the ReturnBB to use the AfterCallBB. + ReturnBB->replaceAllUsesWith(AfterCallBB); - // Delete the return instruction now and empty AfterCallBB now. + // Delete the return instruction now and empty ReturnBB now. Returns[0]->getParent()->getInstList().erase(Returns[0]); - Caller->getBasicBlockList().erase(AfterCallBB); + Caller->getBasicBlockList().erase(ReturnBB); } // Since we are now done with the Call/Invoke, we can delete it. |