diff options
| author | Devang Patel <dpatel@apple.com> | 2010-03-15 19:05:46 +0000 |
|---|---|---|
| committer | Devang Patel <dpatel@apple.com> | 2010-03-15 19:05:46 +0000 |
| commit | ca704957972df96a86f4ef90ce992bce5a9b60e9 (patch) | |
| tree | 762b1ee02222a6d04e7aca2e435971c486010be7 | |
| parent | 757e75b03326d9e124dfd28bb34ca00c9edcd391 (diff) | |
| download | external_llvm-ca704957972df96a86f4ef90ce992bce5a9b60e9.zip external_llvm-ca704957972df96a86f4ef90ce992bce5a9b60e9.tar.gz external_llvm-ca704957972df96a86f4ef90ce992bce5a9b60e9.tar.bz2 | |
In "empty" bb, the return instruction may not be first instruction, if dbg value intrinsics are present in this bb. Use terminator to find return instructions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98565 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Scalar/SimplifyCFGPass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/lib/Transforms/Scalar/SimplifyCFGPass.cpp index 952d1a8..738c5e8 100644 --- a/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -244,7 +244,7 @@ static bool MergeEmptyReturnBlocks(Function &F) { // If the canonical return block has no PHI node, create one now. PHINode *RetBlockPHI = dyn_cast<PHINode>(RetBlock->begin()); if (RetBlockPHI == 0) { - Value *InVal = cast<ReturnInst>(RetBlock->begin())->getOperand(0); + Value *InVal = cast<ReturnInst>(RetBlock->getTerminator())->getOperand(0); RetBlockPHI = PHINode::Create(Ret->getOperand(0)->getType(), "merge", &RetBlock->front()); |