From fbfb5e6530f805f7edcb6eca18eb76e47433aac5 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sun, 8 Feb 2009 00:16:35 +0000 Subject: When emitting blocks, keep track of which cleanup scope they have. Minor fixes and cleanup. llvm-svn: 64053 --- clang/lib/CodeGen/CodeGenFunction.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'clang/lib/CodeGen/CodeGenFunction.cpp') diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 838de70218d5..0e0140c9ad77 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -119,7 +119,11 @@ void CodeGenFunction::FinishFunction(SourceLocation EndLoc) { assert(BreakContinueStack.empty() && "mismatched push/pop in break/continue stack!"); - + assert(BlockScopes.empty() && + "did not remove all blocks from block scope map!"); + assert(CleanupEntries.empty() && + "mismatched push/pop in cleanup stack!"); + // Emit function epilog (to return). EmitReturnBlock(); @@ -537,8 +541,22 @@ void CodeGenFunction::EmitCleanupBlock() llvm::BasicBlock *CleanupBlock = CE.CleanupBlock; + std::vector Blocks; + std::swap(Blocks, CE.Blocks); + + std::vector BranchFixups; + std::swap(BranchFixups, CE.BranchFixups); + CleanupEntries.pop_back(); EmitBlock(CleanupBlock); + + // Remove all blocks from the block scope map. + for (size_t i = 0, e = Blocks.size(); i != e; ++i) { + assert(BlockScopes.count(Blocks[i]) && + "Did not find block in scope map!"); + + BlockScopes.erase(Blocks[i]); + } } -- cgit v1.2.3