commit f3f91cee43b3c7cce74a028c1af4783a7cb6fdc4
author Anders Carlsson <andersca@mac.com> Sun May 31 00:33:20 2009 +0000
committer Anders Carlsson <andersca@mac.com> Sun May 31 00:33:20 2009 +0000
tree 4d4b8b8f0ca6bfb5b08fb0bda21d3f71b0fad2fa
parent c0092ad333ef6823ced088081713e28737380e59

When possible, don't emit the cleanup block. Instead, just move the instructions to the current block.

llvm-svn: 72654

clang/lib/CodeGen/CodeGenFunction.cpp

diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp
index 1a95e61..672f6da 100644
--- a/clang/lib/CodeGen/CodeGenFunction.cpp
+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
@@ -652,7 +652,13 @@
 {
   CleanupBlockInfo Info = PopCleanupBlock();
   
-  EmitBlock(Info.CleanupBlock);
+  llvm::BasicBlock *CurBB = Builder.GetInsertBlock();
+  if (CurBB && !CurBB->getTerminator() && 
+      Info.CleanupBlock->getNumUses() == 0) {
+    CurBB->getInstList().splice(CurBB->end(), Info.CleanupBlock->getInstList());
+    delete Info.CleanupBlock;
+  } else 
+    EmitBlock(Info.CleanupBlock);
   
   if (Info.SwitchBlock)
     EmitBlock(Info.SwitchBlock);