diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-26 09:11:52 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-26 09:11:52 +0000 |
| commit | 9a561d539158a30b68fc258b81a994f3fac10212 (patch) | |
| tree | ac85805437971025bbd67c1c762b9874ae4a481b /lib/CodeGen/CGClass.cpp | |
| parent | 155c54c011ecc2ffdaf7759ec5dbbafafff40618 (diff) | |
Ensure that we delete destructors in the right cases. Specifically:
- variant members with nontrivial destructors make the containing class's
destructor deleted
- check for a virtual destructor after checking for overridden methods in the
base class(es)
- check for an inaccessible operator delete for a class with a virtual
destructor.
Do not try to call an anonymous union field's destructor from the destructor of
the containing class.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151483 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGClass.cpp')
| -rw-r--r-- | lib/CodeGen/CGClass.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 618a3f86cd..b9abbf2901 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -1062,6 +1062,10 @@ void CodeGenFunction::EnterDtorCleanups(const CXXDestructorDecl *DD, QualType::DestructionKind dtorKind = type.isDestructedType(); if (!dtorKind) continue; + // Anonymous union members do not have their destructors called. + const RecordType *RT = type->getAsUnionType(); + if (RT && RT->getDecl()->isAnonymousStructOrUnion()) continue; + CleanupKind cleanupKind = getCleanupKind(dtorKind); EHStack.pushCleanup<DestroyField>(cleanupKind, field, getDestroyer(dtorKind), |