diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CodeGen/CGCXX.cpp | 2 | ||||
-rw-r--r-- | lib/CodeGen/CGExprAgg.cpp | 6 | ||||
-rw-r--r-- | lib/CodeGen/CGExprComplex.cpp | 6 | ||||
-rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 10 | ||||
-rw-r--r-- | lib/CodeGen/CGStmt.cpp | 20 | ||||
-rw-r--r-- | lib/CodeGen/CodeGenFunction.cpp | 4 |
6 files changed, 24 insertions, 24 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 3826e765e6..70eeb942b7 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -116,7 +116,7 @@ CodeGenFunction::GenerateStaticCXXBlockVarDecl(const VarDecl &D) llvm::Value *ICmp = Builder.CreateICmpEQ(V, nullValue , "tobool"); llvm::BasicBlock *InitBlock = createBasicBlock("init"); - llvm::BasicBlock *EndBlock = createBasicBlock("initend"); + llvm::BasicBlock *EndBlock = createBasicBlock("init.end"); // If the guard variable is 0, jump to the initializer code. Builder.CreateCondBr(ICmp, InitBlock, EndBlock); diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp index f531d3676f..1b554b2205 100644 --- a/lib/CodeGen/CGExprAgg.cpp +++ b/lib/CodeGen/CGExprAgg.cpp @@ -229,9 +229,9 @@ void AggExprEmitter::VisitBinAssign(const BinaryOperator *E) { } void AggExprEmitter::VisitConditionalOperator(const ConditionalOperator *E) { - llvm::BasicBlock *LHSBlock = CGF.createBasicBlock("cond.?"); - llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("cond.:"); - llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.cont"); + llvm::BasicBlock *LHSBlock = CGF.createBasicBlock("cond.true"); + llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("cond.false"); + llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.end"); llvm::Value *Cond = CGF.EvaluateExprAsBool(E->getCond()); Builder.CreateCondBr(Cond, LHSBlock, RHSBlock); diff --git a/lib/CodeGen/CGExprComplex.cpp b/lib/CodeGen/CGExprComplex.cpp index afe6fc2329..f9685d4754 100644 --- a/lib/CodeGen/CGExprComplex.cpp +++ b/lib/CodeGen/CGExprComplex.cpp @@ -467,9 +467,9 @@ ComplexPairTy ComplexExprEmitter::VisitBinComma(const BinaryOperator *E) { ComplexPairTy ComplexExprEmitter:: VisitConditionalOperator(const ConditionalOperator *E) { - llvm::BasicBlock *LHSBlock = CGF.createBasicBlock("cond.?"); - llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("cond.:"); - llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.cont"); + llvm::BasicBlock *LHSBlock = CGF.createBasicBlock("cond.true"); + llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("cond.false"); + llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.end"); llvm::Value *Cond = CGF.EvaluateExprAsBool(E->getCond()); Builder.CreateCondBr(Cond, LHSBlock, RHSBlock); diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index e8ebb28afa..a838a0523a 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1033,8 +1033,8 @@ Value *ScalarExprEmitter::VisitBinLAnd(const BinaryOperator *E) { return llvm::Constant::getNullValue(CGF.LLVMIntTy); } - llvm::BasicBlock *ContBlock = CGF.createBasicBlock("land_cont"); - llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("land_rhs"); + llvm::BasicBlock *ContBlock = CGF.createBasicBlock("land.end"); + llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("land.rhs"); // Branch on the LHS first. If it is false, go to the failure (cont) block. CGF.EmitBranchOnBoolExpr(E->getLHS(), RHSBlock, ContBlock); @@ -1078,8 +1078,8 @@ Value *ScalarExprEmitter::VisitBinLOr(const BinaryOperator *E) { return llvm::Constant::getNullValue(CGF.LLVMIntTy); } - llvm::BasicBlock *ContBlock = CGF.createBasicBlock("lor_cont"); - llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("lor_rhs"); + llvm::BasicBlock *ContBlock = CGF.createBasicBlock("lor.end"); + llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("lor.rhs"); // Branch on the LHS first. If it is true, go to the success (cont) block. CGF.EmitBranchOnBoolExpr(E->getLHS(), ContBlock, RHSBlock); @@ -1175,7 +1175,7 @@ VisitConditionalOperator(const ConditionalOperator *E) { llvm::BasicBlock *LHSBlock = CGF.createBasicBlock("cond.true"); llvm::BasicBlock *RHSBlock = CGF.createBasicBlock("cond.false"); - llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.cont"); + llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.end"); Value *CondVal = 0; // If we have the GNU missing condition extension, evaluate the conditional diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp index ad081c91f7..25c8fd9493 100644 --- a/lib/CodeGen/CGStmt.cpp +++ b/lib/CodeGen/CGStmt.cpp @@ -282,7 +282,7 @@ void CodeGenFunction::EmitIfStmt(const IfStmt &S) { void CodeGenFunction::EmitWhileStmt(const WhileStmt &S) { // Emit the header for the loop, insert it, which will create an uncond br to // it. - llvm::BasicBlock *LoopHeader = createBasicBlock("whilecond"); + llvm::BasicBlock *LoopHeader = createBasicBlock("while.cond"); EmitBlock(LoopHeader); // Evaluate the conditional in the while header. C99 6.8.5.1: The evaluation @@ -299,8 +299,8 @@ void CodeGenFunction::EmitWhileStmt(const WhileStmt &S) { // Create an exit block for when the condition fails, create a block for the // body of the loop. - llvm::BasicBlock *ExitBlock = createBasicBlock("whileexit"); - llvm::BasicBlock *LoopBody = createBasicBlock("whilebody"); + llvm::BasicBlock *ExitBlock = createBasicBlock("while.exit"); + llvm::BasicBlock *LoopBody = createBasicBlock("while.body"); // As long as the condition is true, go to the loop body. if (EmitBoolCondBranch) @@ -333,11 +333,11 @@ void CodeGenFunction::EmitWhileStmt(const WhileStmt &S) { void CodeGenFunction::EmitDoStmt(const DoStmt &S) { // Emit the body for the loop, insert it, which will create an uncond br to // it. - llvm::BasicBlock *LoopBody = createBasicBlock("dobody"); - llvm::BasicBlock *AfterDo = createBasicBlock("afterdo"); + llvm::BasicBlock *LoopBody = createBasicBlock("do.body"); + llvm::BasicBlock *AfterDo = createBasicBlock("do.end"); EmitBlock(LoopBody); - llvm::BasicBlock *DoCond = createBasicBlock("docond"); + llvm::BasicBlock *DoCond = createBasicBlock("do.cond"); // Store the blocks to use for break and continue. BreakContinueStack.push_back(BreakContinue(AfterDo, DoCond)); @@ -391,8 +391,8 @@ void CodeGenFunction::EmitForStmt(const ForStmt &S) { EmitStmt(S.getInit()); // Start the loop with a block that tests the condition. - llvm::BasicBlock *CondBlock = createBasicBlock("forcond"); - llvm::BasicBlock *AfterFor = createBasicBlock("afterfor"); + llvm::BasicBlock *CondBlock = createBasicBlock("for.cond"); + llvm::BasicBlock *AfterFor = createBasicBlock("for.end"); EmitBlock(CondBlock); @@ -400,7 +400,7 @@ void CodeGenFunction::EmitForStmt(const ForStmt &S) { // according to 6.8.5.3p2, aka, true. if (S.getCond()) { // As long as the condition is true, iterate the loop. - llvm::BasicBlock *ForBody = createBasicBlock("forbody"); + llvm::BasicBlock *ForBody = createBasicBlock("for.body"); // C99 6.8.5p2/p4: The first substatement is executed if the expression // compares unequal to 0. The condition must be a scalar type. @@ -416,7 +416,7 @@ void CodeGenFunction::EmitForStmt(const ForStmt &S) { // condition as the continue block. llvm::BasicBlock *ContinueBlock; if (S.getInc()) - ContinueBlock = createBasicBlock("forinc"); + ContinueBlock = createBasicBlock("for.inc"); else ContinueBlock = CondBlock; diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp index c445864bb3..e6deaa7475 100644 --- a/lib/CodeGen/CodeGenFunction.cpp +++ b/lib/CodeGen/CodeGenFunction.cpp @@ -236,7 +236,7 @@ void CodeGenFunction::EmitBranchOnBoolExpr(const Expr *Cond, // Emit the LHS as a conditional. If the LHS conditional is false, we // want to jump to the FalseBlock. - llvm::BasicBlock *LHSTrue = createBasicBlock("land_lhs_true"); + llvm::BasicBlock *LHSTrue = createBasicBlock("land.lhs.true"); EmitBranchOnBoolExpr(CondBOp->getLHS(), LHSTrue, FalseBlock); EmitBlock(LHSTrue); @@ -259,7 +259,7 @@ void CodeGenFunction::EmitBranchOnBoolExpr(const Expr *Cond, // Emit the LHS as a conditional. If the LHS conditional is true, we // want to jump to the TrueBlock. - llvm::BasicBlock *LHSFalse = createBasicBlock("lor_lhs_false"); + llvm::BasicBlock *LHSFalse = createBasicBlock("lor.lhs.false"); EmitBranchOnBoolExpr(CondBOp->getLHS(), TrueBlock, LHSFalse); EmitBlock(LHSFalse); |