diff options
author | Alexey Bataev <a.bataev@hotmail.com> | 2015-07-08 07:31:02 +0000 |
---|---|---|
committer | Alexey Bataev <a.bataev@hotmail.com> | 2015-07-08 07:31:02 +0000 |
commit | 5d49b83020288e7c1f449b141cc4ef504dd494ad (patch) | |
tree | 0b47c9aa1d611c340307e6d9d2a29526562d58b8 /clang/lib/CodeGen/CGClass.cpp | |
parent | f1eef8025f9d86c8da3cd85caeb7167de3fb19c5 (diff) | |
download | llvm-5d49b83020288e7c1f449b141cc4ef504dd494ad.zip llvm-5d49b83020288e7c1f449b141cc4ef504dd494ad.tar.gz llvm-5d49b83020288e7c1f449b141cc4ef504dd494ad.tar.bz2 |
[EH] Fix for clang bug 24005 - no cleanup for array of memcpy-able objects in struct (patch by Denis Zobnin)
The fix is to emit cleanup for arrays of memcpy-able objects in struct if an exception is thrown later during copy-construction.
Differential Revision: http://reviews.llvm.org/D10989
llvm-svn: 241670
Diffstat (limited to 'clang/lib/CodeGen/CGClass.cpp')
-rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 62df982..145a0e6 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -606,6 +606,11 @@ static void EmitMemberInitializer(CodeGenFunction &CGF, // Copy the aggregate. CGF.EmitAggregateCopy(LHS.getAddress(), Src.getAddress(), FieldType, LHS.isVolatileQualified()); + // Ensure that we destroy the objects if an exception is thrown later in + // the constructor. + QualType::DestructionKind dtorKind = FieldType.isDestructedType(); + if (CGF.needsEHCleanup(dtorKind)) + CGF.pushEHDestroy(dtorKind, LHS.getAddress(), FieldType); return; } } |