[Sema] Commit a better fix for r240242
Skip calls to HasTrivialDestructorBody() in the case where the destructor is never invoked. Alternatively, Richard proposed to change Sema to declare a trivial destructor for anonymous union member, which seems too wasteful. Differential Revision: http://reviews.llvm.org/D10508 llvm-svn: 240742
This commit is contained in:
parent
2ca46867e1
commit
982bbf404e
|
@ -1294,10 +1294,6 @@ HasTrivialDestructorBody(ASTContext &Context,
|
|||
if (BaseClassDecl->hasTrivialDestructor())
|
||||
return true;
|
||||
|
||||
// Give up if the destructor is not accessible.
|
||||
if (!BaseClassDecl->getDestructor())
|
||||
return false;
|
||||
|
||||
if (!BaseClassDecl->getDestructor()->hasTrivialBody())
|
||||
return false;
|
||||
|
||||
|
@ -1343,6 +1339,11 @@ FieldHasTrivialDestructorBody(ASTContext &Context,
|
|||
return true;
|
||||
|
||||
CXXRecordDecl *FieldClassDecl = cast<CXXRecordDecl>(RT->getDecl());
|
||||
|
||||
// The destructor for an implicit anonymous union member is never invoked.
|
||||
if (FieldClassDecl->isUnion() && FieldClassDecl->isAnonymousStructOrUnion())
|
||||
return false;
|
||||
|
||||
return HasTrivialDestructorBody(Context, FieldClassDecl, FieldClassDecl);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue