Add CodeGenFunction::EmitBranch.
- Emits an unconditional branch, with extra logic to avoid generating
spurious branches out of dummy blocks.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59037 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 4a17938..4655741 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -1139,14 +1139,14 @@
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);