diff options
Diffstat (limited to 'lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 4a17938357..465574187a 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1139,14 +1139,14 @@ VisitConditionalOperator(const ConditionalOperator *E) { else // Perform promotions, to handle cases like "short ?: int" LHS = EmitScalarConversion(CondVal, E->getCond()->getType(), E->getType()); - Builder.CreateBr(ContBlock); LHSBlock = Builder.GetInsertBlock(); + CGF.EmitBranch(ContBlock); CGF.EmitBlock(RHSBlock); Value *RHS = Visit(E->getRHS()); - Builder.CreateBr(ContBlock); RHSBlock = Builder.GetInsertBlock(); + CGF.EmitBranch(ContBlock); CGF.EmitBlock(ContBlock); |