diff options
author | Chris Lattner <sabre@nondot.org> | 2004-10-17 23:21:07 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2004-10-17 23:21:07 +0000 |
commit | 3787e765facfad5ea62753922d940bcdd52afd57 (patch) | |
tree | de90f748cd9f0dc358da573e1404d7d9023beb20 | |
parent | 58f8bdc6c64c9b0d29dbca25767bf0ef190e256c (diff) | |
download | external_llvm-3787e765facfad5ea62753922d940bcdd52afd57.zip external_llvm-3787e765facfad5ea62753922d940bcdd52afd57.tar.gz external_llvm-3787e765facfad5ea62753922d940bcdd52afd57.tar.bz2 |
Fix Regression/Transforms/Inline/2004-10-17-InlineFunctionWithoutReturn.ll
If a function had no return instruction in it, and the result of the inlined
call instruction was used, we would crash.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17104 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Transforms/Utils/InlineFunction.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 9f47825..77cf111 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -16,7 +16,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Transforms/Utils/Cloning.h" -#include "llvm/Constant.h" +#include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/Instructions.h" @@ -316,12 +316,16 @@ bool llvm::InlineFunction(CallSite CS) { ReturnBB->replaceAllUsesWith(AfterCallBB); // Delete the return instruction now and empty ReturnBB now. - Returns[0]->getParent()->getInstList().erase(Returns[0]); - Caller->getBasicBlockList().erase(ReturnBB); + Returns[0]->eraseFromParent(); + ReturnBB->eraseFromParent(); + } else if (!TheCall->use_empty()) { + // No returns, but something is using the return value of the call. Just + // nuke the result. + TheCall->replaceAllUsesWith(UndefValue::get(TheCall->getType())); } // Since we are now done with the Call/Invoke, we can delete it. - TheCall->getParent()->getInstList().erase(TheCall); + TheCall->eraseFromParent(); // We should always be able to fold the entry block of the function into the // single predecessor of the block... |