When emitting blocks, keep track of which cleanup scope they have. Minor fixes and cleanup.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64053 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 8a02207..3dbc2c9 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -253,11 +253,22 @@
explicit CleanupEntry(llvm::BasicBlock *cb)
: CleanupBlock(cb) {}
+
+ ~CleanupEntry() {
+ assert(Blocks.empty() && "Did not empty blocks!");
+ assert(BranchFixups.empty() && "Did not empty branch fixups!");
+ }
+
};
/// CleanupEntries - Stack of cleanup entries.
llvm::SmallVector<CleanupEntry, 8> CleanupEntries;
+ typedef llvm::DenseMap<llvm::BasicBlock*, size_t> BlockScopeMap;
+
+ /// BlockScopes - Map of which "cleanup scope" scope basic blocks have.
+ BlockScopeMap BlockScopes;
+
public:
CodeGenFunction(CodeGenModule &cgm);