Ensure we run cleanups for CXXTemporaries on the exceptional edge. WIP.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91588 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp
index c66bb46..debebf2 100644
--- a/lib/CodeGen/CGException.cpp
+++ b/lib/CodeGen/CGException.cpp
@@ -150,17 +150,37 @@
} else if (CXXConstructorDecl *CopyCtor
= RD->getCopyConstructor(CGF.getContext(), 0)) {
llvm::BasicBlock *PrevLandingPad = CGF.getInvokeDest();
+ llvm::Value *CondPtr = 0;
if (CGF.Exceptions) {
CodeGenFunction::EHCleanupBlock Cleanup(CGF);
llvm::Constant *FreeExceptionFn = getFreeExceptionFn(CGF);
+ llvm::BasicBlock *CondBlock = CGF.createBasicBlock("cond.free");
+ llvm::BasicBlock *Cont = CGF.createBasicBlock("cont");
+ CondPtr = CGF.CreateTempAlloca(llvm::Type::getInt1Ty(CGF.getLLVMContext()),
+ "doEHfree");
+
+ CGF.Builder.CreateCondBr(CGF.Builder.CreateLoad(CondPtr),
+ CondBlock, Cont);
+ CGF.EmitBlock(CondBlock);
+
// Load the exception pointer.
llvm::Value *ExceptionPtr = CGF.Builder.CreateLoad(ExceptionPtrPtr);
CGF.Builder.CreateCall(FreeExceptionFn, ExceptionPtr);
+
+ CGF.EmitBlock(Cont);
}
+ if (CondPtr)
+ CGF.Builder.CreateStore(llvm::ConstantInt::getTrue(CGF.getLLVMContext()),
+ CondPtr);
+
llvm::Value *Src = CGF.EmitLValue(E).getAddress();
- CGF.setInvokeDest(PrevLandingPad);
+
+ //CGF.setInvokeDest(PrevLandingPad);
+ if (CondPtr)
+ CGF.Builder.CreateStore(llvm::ConstantInt::getFalse(CGF.getLLVMContext()),
+ CondPtr);
llvm::BasicBlock *TerminateHandler = CGF.getTerminateHandler();
PrevLandingPad = CGF.getInvokeDest();