1 files changed, 5 insertions, 1 deletions
diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp
index d714911054..5f54935361 100644
--- a/lib/CodeGen/CGException.cpp
+++ b/lib/CodeGen/CGException.cpp
@@ -134,9 +134,12 @@ static void CopyObject(CodeGenFunction &CGF, const Expr *E, llvm::Value *N) {
     } else if (CXXConstructorDecl *CopyCtor
                = RD->getCopyConstructor(CGF.getContext(), 0)) {
       // All temporaries end before we call __cxa_throw
-      CodeGenFunction::CleanupScope TryScope(CGF);
+      // FIXME: Doesn't work well with eh31.C and PopCXXTemporary
+      // CodeGenFunction::CleanupScope TryScope(CGF);
       {
         // These actions are only on the exceptional edge.
+#if 0
+        // FIXME: Doesn't work well with eh31.C and PopCXXTemporary
         CodeGenFunction::DelayedCleanupBlock Scope(CGF, true);
 
         llvm::Constant *FreeExceptionFn = getFreeExceptionFn(CGF);
@@ -144,6 +147,7 @@ static void CopyObject(CodeGenFunction &CGF, const Expr *E, llvm::Value *N) {
           = llvm::Type::getInt8PtrTy(CGF.getLLVMContext());
         llvm::Value *ExceptionPtr = CGF.Builder.CreateBitCast(N, Int8PtrTy);
         CGF.Builder.CreateCall(FreeExceptionFn, ExceptionPtr);
+#endif
       }
 
       llvm::Value *Src = CGF.EmitLValue(E).getAddress();