From: Anders Carlsson Date: Sat, 6 Feb 2010 19:50:17 +0000 (+0000) Subject: If a constructor throws an exception we need to execute the destructors for all fully... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9405dcd83f090d86d5d06ab3a4e59cc39e7edd93;p=clang If a constructor throws an exception we need to execute the destructors for all fully constructed members. Fixes ctor_dtor_count.cpp in the test suite. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95501 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 3804a7cf83..4ec524da8b 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -849,6 +849,25 @@ static void EmitMemberInitializer(CodeGenFunction &CGF, } else { CGF.EmitAggExpr(MemberInit->getInit(), LHS.getAddress(), LHS.isVolatileQualified(), false, true); + + if (!CGF.Exceptions) + return; + + const RecordType *RT = FieldType->getAs(); + if (!RT) + return; + + CXXRecordDecl *RD = cast(RT->getDecl()); + if (!RD->hasTrivialDestructor()) { + // FIXME: Is this OK for C++0x delegating constructors? + CodeGenFunction::EHCleanupBlock Cleanup(CGF); + + llvm::Value *ThisPtr = CGF.LoadCXXThis(); + LValue LHS = CGF.EmitLValueForField(ThisPtr, Field, 0); + + CXXDestructorDecl *DD = RD->getDestructor(CGF.getContext()); + CGF.EmitCXXDestructorCall(DD, Dtor_Complete, LHS.getAddress()); + } } }