For if blocks with no else, name the join block ifend instead of the
more confusing ifelse.
Use dotted names for if blocks (if.then vs ifthen).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59201 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index e405086..a66b6fe 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -250,13 +250,12 @@
// Otherwise, the condition did not fold, or we couldn't elide it. Just emit
// the conditional branch.
- llvm::BasicBlock *ThenBlock = createBasicBlock("ifthen");
- llvm::BasicBlock *ElseBlock = createBasicBlock("ifelse");
- EmitBranchOnBoolExpr(S.getCond(), ThenBlock, ElseBlock);
-
- llvm::BasicBlock *ContBlock = ElseBlock;
+ llvm::BasicBlock *ThenBlock = createBasicBlock("if.then");
+ llvm::BasicBlock *ContBlock = createBasicBlock("if.end");
+ llvm::BasicBlock *ElseBlock = ContBlock;
if (S.getElse())
- ContBlock = createBasicBlock("ifend");
+ ElseBlock = createBasicBlock("if.else");
+ EmitBranchOnBoolExpr(S.getCond(), ThenBlock, ElseBlock);
// Emit the 'then' code.
EmitBlock(ThenBlock);