[cfe-commits] r64203 - in /cfe/trunk/lib/CodeGen: CGObjC.cpp CGStmt.cpp CodeGenFunction.h
Anders Carlsson
andersca at mac.com
Mon Feb 9 21:52:02 PST 2009
Author: andersca
Date: Mon Feb 9 23:52:02 2009
New Revision: 64203
URL: http://llvm.org/viewvc/llvm-project?rev=64203&view=rev
Log:
Start removing the old Obj-C EH stack now that the cleanup stack is used instead.
Modified:
cfe/trunk/lib/CodeGen/CGObjC.cpp
cfe/trunk/lib/CodeGen/CGStmt.cpp
cfe/trunk/lib/CodeGen/CodeGenFunction.h
Modified: cfe/trunk/lib/CodeGen/CGObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjC.cpp?rev=64203&r1=64202&r2=64203&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjC.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjC.cpp Mon Feb 9 23:52:02 2009
@@ -361,11 +361,6 @@
return;
}
- // We want to ensure that any vlas between here and when we
- // push the break and continue context below can be destroyed
- // when we break
- llvm::Value *saveBreakStackDepth = StackDepth;
-
if (const DeclStmt *SD = dyn_cast<DeclStmt>(S.getElement())) {
EmitStmt(SD);
assert(HaveInsertPoint() && "DeclStmt destroyed insert point!");
@@ -520,8 +515,7 @@
llvm::BasicBlock *LoopEnd = createBasicBlock("loopend");
llvm::BasicBlock *AfterBody = createBasicBlock("afterbody");
- // Ensure any vlas created between there and here, are undone
- BreakContinuePush(LoopEnd, AfterBody, saveBreakStackDepth, StackDepth);
+ BreakContinueStack.push_back(BreakContinue(LoopEnd, AfterBody));
EmitStmt(S.getBody());
Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=64203&r1=64202&r2=64203&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Mon Feb 9 23:52:02 2009
@@ -395,7 +395,7 @@
llvm::BasicBlock *LoopBody = createBasicBlock("while.body");
// Store the blocks to use for break and continue.
- BreakContinuePush(ExitBlock, LoopHeader);
+ BreakContinueStack.push_back(BreakContinue(ExitBlock, LoopHeader));
// Evaluate the conditional in the while header. C99 6.8.5.1: The
// evaluation of the controlling expression takes place before each
@@ -417,7 +417,7 @@
EmitBlock(LoopBody);
EmitStmt(S.getBody());
- BreakContinuePop();
+ BreakContinueStack.pop_back();
// Cycle to the condition.
EmitBranch(LoopHeader);
@@ -444,12 +444,12 @@
llvm::BasicBlock *DoCond = createBasicBlock("do.cond");
// Store the blocks to use for break and continue.
- BreakContinuePush(AfterDo, DoCond);
+ BreakContinueStack.push_back(BreakContinue(AfterDo, DoCond));
// Emit the body of the loop into the block.
EmitStmt(S.getBody());
- BreakContinuePop();
+ BreakContinueStack.pop_back();
EmitBlock(DoCond);
@@ -497,8 +497,6 @@
EmitBlock(CondBlock);
- llvm::Value *saveStackDepth = StackDepth;
-
// Evaluate the condition if present. If not, treat it as a
// non-zero-constant according to 6.8.5.3p2, aka, true.
if (S.getCond()) {
@@ -524,14 +522,12 @@
ContinueBlock = CondBlock;
// Store the blocks to use for break and continue.
- // Ensure any vlas created between there and here, are undone
- BreakContinuePush(AfterFor, ContinueBlock,
- saveStackDepth, saveStackDepth);
+ BreakContinueStack.push_back(BreakContinue(AfterFor, ContinueBlock));
// If the condition is true, execute the body of the for stmt.
EmitStmt(S.getBody());
- BreakContinuePop();
+ BreakContinueStack.pop_back();
// If there is an increment, emit it next.
if (S.getInc()) {
@@ -609,23 +605,12 @@
void CodeGenFunction::EmitBreakStmt(const BreakStmt &S) {
assert(!BreakContinueStack.empty() && "break stmt not in a loop or switch!");
- // FIXME: Implement break in @try or @catch blocks.
- if (ObjCEHStack.size() != BreakContinueStack.back().EHStackSize) {
- CGM.ErrorUnsupported(&S, "break inside an Obj-C exception block");
- return;
- }
-
// If this code is reachable then emit a stop point (if generating
// debug info). We have to do this ourselves because we are on the
// "simple" statement path.
if (HaveInsertPoint())
EmitStopPoint(&S);
- // We need to adjust the stack, if the destination was (will be) at
- // a different depth.
- if (EmitStackUpdate(BreakContinueStack.back().SaveBreakStackDepth))
- assert (0 && "break vla botch");
-
llvm::BasicBlock *Block = BreakContinueStack.back().BreakBlock;
EmitBranchThroughCleanup(Block);
}
@@ -633,23 +618,12 @@
void CodeGenFunction::EmitContinueStmt(const ContinueStmt &S) {
assert(!BreakContinueStack.empty() && "continue stmt not in a loop!");
- // FIXME: Implement continue in @try or @catch blocks.
- if (ObjCEHStack.size() != BreakContinueStack.back().EHStackSize) {
- CGM.ErrorUnsupported(&S, "continue inside an Obj-C exception block");
- return;
- }
-
// If this code is reachable then emit a stop point (if generating
// debug info). We have to do this ourselves because we are on the
// "simple" statement path.
if (HaveInsertPoint())
EmitStopPoint(&S);
- // We need to adjust the stack, if the destination was (will be) at
- // a different depth.
- if (EmitStackUpdate(BreakContinueStack.back().SaveContinueStackDepth))
- assert (0 && "continue vla botch");
-
llvm::BasicBlock *Block = BreakContinueStack.back().ContinueBlock;
EmitBranchThroughCleanup(Block);
}
@@ -741,9 +715,6 @@
llvm::SwitchInst *SavedSwitchInsn = SwitchInsn;
llvm::BasicBlock *SavedCRBlock = CaseRangeBlock;
- // Ensure any vlas created inside are destroyed on break.
- llvm::Value *saveBreakStackDepth = StackDepth;
-
// Create basic block to hold stuff that comes after switch
// statement. We also need to create a default block now so that
// explicit case ranges tests can have a place to jump to on
@@ -758,19 +729,17 @@
// All break statements jump to NextBlock. If BreakContinueStack is non empty
// then reuse last ContinueBlock.
- llvm::BasicBlock *ContinueBlock = NULL;
- llvm::Value *saveContinueStackDepth = NULL;
- if (!BreakContinueStack.empty()) {
+ llvm::BasicBlock *ContinueBlock = 0;
+ if (!BreakContinueStack.empty())
ContinueBlock = BreakContinueStack.back().ContinueBlock;
- saveContinueStackDepth = BreakContinueStack.back().SaveContinueStackDepth;
- }
+
// Ensure any vlas created between there and here, are undone
- BreakContinuePush(NextBlock, ContinueBlock,
- saveBreakStackDepth, saveContinueStackDepth);
+ BreakContinueStack.push_back(BreakContinue(NextBlock, ContinueBlock));
// Emit switch body.
EmitStmt(S.getBody());
- BreakContinuePop();
+
+ BreakContinueStack.pop_back();
// Update the default block in case explicit case range tests have
// been chained on top.
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=64203&r1=64202&r2=64203&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Mon Feb 9 23:52:02 2009
@@ -205,39 +205,14 @@
/// LabelMap - This keeps track of the LLVM basic block for each C label.
llvm::DenseMap<const LabelStmt*, llvm::BasicBlock*> LabelMap;
- /// BreakContinuePush - Note a new break and continue level. This must be
- /// called at the stack depth of the continue block. In particular, this must
- /// not be called after the controlling condition has possibly started a vla.
- void BreakContinuePush(llvm::BasicBlock *bb, llvm::BasicBlock *cb) {
- BreakContinueStack.push_back(BreakContinue(bb, cb, StackDepth,
- StackDepth,
- ObjCEHStack.size()));
- }
- void BreakContinuePush(llvm::BasicBlock *bb, llvm::BasicBlock *cb,
- llvm::Value *bsd, llvm::Value *csd) {
- BreakContinueStack.push_back(BreakContinue(bb, cb, bsd, csd,
- ObjCEHStack.size()));
- }
-
- /// BreakContinuePop - Note end of previous break and continue level.
- void BreakContinuePop() {
- BreakContinueStack.pop_back();
- }
-
// BreakContinueStack - This keeps track of where break and continue
- // statements should jump to, as well as the depth of the stack and the size
- // of the eh stack.
+ // statements should jump to.
struct BreakContinue {
- BreakContinue(llvm::BasicBlock *bb, llvm::BasicBlock *cb,
- llvm::Value *bsd, llvm::Value *csd, size_t ehss)
- : BreakBlock(bb), ContinueBlock(cb), SaveBreakStackDepth(bsd),
- SaveContinueStackDepth(csd), EHStackSize(ehss) {}
+ BreakContinue(llvm::BasicBlock *bb, llvm::BasicBlock *cb)
+ : BreakBlock(bb), ContinueBlock(cb) {}
llvm::BasicBlock *BreakBlock;
llvm::BasicBlock *ContinueBlock;
- llvm::Value *SaveBreakStackDepth;
- llvm::Value *SaveContinueStackDepth;
- size_t EHStackSize;
};
llvm::SmallVector<BreakContinue, 8> BreakContinueStack;
More information about the cfe-commits
mailing list