diff options
| author | Jay Foad <jay.foad@gmail.com> | 2011-03-30 11:19:20 +0000 |
|---|---|---|
| committer | Jay Foad <jay.foad@gmail.com> | 2011-03-30 11:19:20 +0000 |
| commit | d8b4fb4aab4d6fedb2b14bed1b846451b17bde7c (patch) | |
| tree | fb1299f91120b2d0bf513abc2ac6f42393fc627d /lib/Transforms/Scalar/SimplifyCFGPass.cpp | |
| parent | 8be7d8b43cef4fda9dec3ce05449e3d74c25fb04 (diff) | |
| download | external_llvm-d8b4fb4aab4d6fedb2b14bed1b846451b17bde7c.zip external_llvm-d8b4fb4aab4d6fedb2b14bed1b846451b17bde7c.tar.gz external_llvm-d8b4fb4aab4d6fedb2b14bed1b846451b17bde7c.tar.bz2 | |
(Almost) always call reserveOperandSpace() on newly created PHINodes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128535 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar/SimplifyCFGPass.cpp')
| -rw-r--r-- | lib/Transforms/Scalar/SimplifyCFGPass.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/lib/Transforms/Scalar/SimplifyCFGPass.cpp index ce5dd73..e3a9329 100644 --- a/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -259,11 +259,12 @@ static bool MergeEmptyReturnBlocks(Function &F) { PHINode *RetBlockPHI = dyn_cast<PHINode>(RetBlock->begin()); if (RetBlockPHI == 0) { Value *InVal = cast<ReturnInst>(RetBlock->getTerminator())->getOperand(0); + pred_iterator PB = pred_begin(RetBlock), PE = pred_end(RetBlock); RetBlockPHI = PHINode::Create(Ret->getOperand(0)->getType(), "merge", &RetBlock->front()); + RetBlockPHI->reserveOperandSpace(std::distance(PB, PE)); - for (pred_iterator PI = pred_begin(RetBlock), E = pred_end(RetBlock); - PI != E; ++PI) + for (pred_iterator PI = PB; PI != PE; ++PI) RetBlockPHI->addIncoming(InVal, *PI); RetBlock->getTerminator()->setOperand(0, RetBlockPHI); } |