[cfe-commits] r59210 - in /cfe/trunk/lib/CodeGen: CGCXX.cpp CGExprAgg.cpp CGExprComplex.cpp CGExprScalar.cpp CGStmt.cpp CodeGenFunction.cpp
Daniel Dunbar
daniel at zuster.org
Wed Nov 12 17:38:36 PST 2008
Author: ddunbar
Date: Wed Nov 12 19:38:36 2008
New Revision: 59210
URL: http://llvm.org/viewvc/llvm-project?rev=59210&view=rev
Log:
Normalize many BasicBlock names.
- Use dotted notation for blocks related to a particular statement
type.
- Use .end for landing pads.
No functionality change in NDEBUG mode. :)
Modified:
cfe/trunk/lib/CodeGen/CGCXX.cpp
cfe/trunk/lib/CodeGen/CGExprAgg.cpp
cfe/trunk/lib/CodeGen/CGExprComplex.cpp
cfe/trunk/lib/CodeGen/CGExprScalar.cpp
cfe/trunk/lib/CodeGen/CGStmt.cpp
cfe/trunk/lib/CodeGen/CodeGenFunction.cpp
Modified: cfe/trunk/lib/CodeGen/CGCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCXX.cpp?rev=59210&r1=59209&r2=59210&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCXX.cpp Wed Nov 12 19:38:36 2008
@@ -116,7 +116,7 @@
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);
Modified: cfe/trunk/lib/CodeGen/CGExprAgg.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprAgg.cpp?rev=59210&r1=59209&r2=59210&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprAgg.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprAgg.cpp Wed Nov 12 19:38:36 2008
@@ -229,9 +229,9 @@
}
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);
Modified: cfe/trunk/lib/CodeGen/CGExprComplex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprComplex.cpp?rev=59210&r1=59209&r2=59210&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprComplex.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprComplex.cpp Wed Nov 12 19:38:36 2008
@@ -467,9 +467,9 @@
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);
Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=59210&r1=59209&r2=59210&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Wed Nov 12 19:38:36 2008
@@ -1033,8 +1033,8 @@
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 @@
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 @@
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
Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=59210&r1=59209&r2=59210&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Wed Nov 12 19:38:36 2008
@@ -282,7 +282,7 @@
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 @@
// 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::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 @@
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 @@
// 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 @@
// condition as the continue block.
llvm::BasicBlock *ContinueBlock;
if (S.getInc())
- ContinueBlock = createBasicBlock("forinc");
+ ContinueBlock = createBasicBlock("for.inc");
else
ContinueBlock = CondBlock;
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.cpp?rev=59210&r1=59209&r2=59210&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.cpp Wed Nov 12 19:38:36 2008
@@ -236,7 +236,7 @@
// 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 @@
// 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);
More information about the cfe-commits
mailing list