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 | e0938d8a87a6c8b12f68fbe784a270dd2d552331 (patch) | |
| tree | 98d4fbcf8ebe8ec03e205e22d98469b177234a95 /llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp | |
| parent | 27e20c3c586da61e5fe9218aa9fe5733e34c18c2 (diff) | |
| download | bcm5719-llvm-e0938d8a87a6c8b12f68fbe784a270dd2d552331.tar.gz bcm5719-llvm-e0938d8a87a6c8b12f68fbe784a270dd2d552331.zip | |
(Almost) always call reserveOperandSpace() on newly created PHINodes.
llvm-svn: 128535
Diffstat (limited to 'llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp index ce5dd73ace3..e3a9329a18d 100644 --- a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/llvm/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); } |
