[cfe-commits] r90996 - /cfe/trunk/lib/CodeGen/CodeGenFunction.h

[Mike Stump]

Author: mrs
Date: Wed Dec  9 17:49:53 2009
New Revision: 90996

URL: http://llvm.org/viewvc/llvm-project?rev=90996&view=rev
Log:
Add terminate handler to cleanups on exceptional edges.

Modified:
    cfe/trunk/lib/CodeGen/CodeGenFunction.h

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=90996&r1=90995&r2=90996&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Wed Dec  9 17:49:53 2009
@@ -161,10 +161,9 @@
         CleanupEntryBB(CGF.createBasicBlock("ehcleanup.rest")),
         PreviousInvokeDest(CGF.getInvokeDest()) {
       CGF.EmitBranch(Cont);
+      llvm::BasicBlock *TerminateHandler = CGF.getTerminateHandler();
       CGF.Builder.SetInsertPoint(CleanupEntryBB);
-
-      // FIXME: set up terminate handler here
-      // CGF.setInvokeDest(TerminateHandler);
+      CGF.setInvokeDest(TerminateHandler);
     }
     ~EHCleanupBlock();
   };