1 files changed, 2 insertions, 3 deletions
diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 30cc5d9cbf..7ef3ad0422 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -161,10 +161,9 @@ public:
         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();
   };