summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGExpr.cpp
diff options
context:
space:
mode:
authorJay Foad <jay.foad@gmail.com>2011-03-30 11:28:58 +0000
committerJay Foad <jay.foad@gmail.com>2011-03-30 11:28:58 +0000
commit20c0f02cc559e65b4e3c01a82124ee38140aaea6 (patch)
tree832cf9b33a5d569809c88ce73663eda4a4c37b84 /clang/lib/CodeGen/CGExpr.cpp
parent52131344a2cbb29f60b75417d32f886032007b1f (diff)
downloadbcm5719-llvm-20c0f02cc559e65b4e3c01a82124ee38140aaea6.tar.gz
bcm5719-llvm-20c0f02cc559e65b4e3c01a82124ee38140aaea6.zip
Remove PHINode::reserveOperandSpace(). Instead, add a parameter to
PHINode::Create() giving the (known or expected) number of operands. llvm-svn: 128538
Diffstat (limited to 'clang/lib/CodeGen/CGExpr.cpp')
-rw-r--r--clang/lib/CodeGen/CGExpr.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 34a231cea17..6a7be0fe6e8 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1765,9 +1765,8 @@ EmitConditionalOperatorLValue(const AbstractConditionalOperator *expr) {
EmitBlock(contBlock);
- llvm::PHINode *phi = Builder.CreatePHI(lhs.getAddress()->getType(),
+ llvm::PHINode *phi = Builder.CreatePHI(lhs.getAddress()->getType(), 2,
"cond-lvalue");
- phi->reserveOperandSpace(2);
phi->addIncoming(lhs.getAddress(), lhsBlock);
phi->addIncoming(rhs.getAddress(), rhsBlock);
return MakeAddrLValue(phi, expr->getType());
OpenPOWER on IntegriCloud