Fixed check for trivial destructor using Dtr->isTrivial() now, removed union

Author: egorshamshura

clang/lib/Sema/SemaTypeTraits.cpp

@@ -2112,23 +2112,6 @@ static void DiagnoseNonTriviallyCopyableReason(Sema &SemaRef,
         << diag::TraitNotSatisfiedReason::DeletedDtr << 0
         << D->getDestructor()->getSourceRange();
 
-  if (D->isUnion()) {
-    auto DiagSPM = [&](CXXSpecialMemberKind K, bool Has) {
-      if (Has)
-        SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
-            << diag::TraitNotSatisfiedReason::UnionWithUserDeclaredSMF << K;
-    };
-    DiagSPM(CXXSpecialMemberKind::CopyConstructor,
-            D->hasUserDeclaredCopyConstructor());
-    DiagSPM(CXXSpecialMemberKind::CopyAssignment,
-            D->hasUserDeclaredCopyAssignment());
-    DiagSPM(CXXSpecialMemberKind::MoveConstructor,
-            D->hasUserDeclaredMoveConstructor());
-    DiagSPM(CXXSpecialMemberKind::MoveAssignment,
-            D->hasUserDeclaredMoveAssignment());
-    return;
-  }
-
   if (!D->hasSimpleMoveConstructor() && !D->hasSimpleCopyConstructor()) {
     const auto *Decl = cast<CXXConstructorDecl>(
         LookupSpecialMemberFromXValue(SemaRef, D, /*Assign=*/false));
@@ -2146,7 +2129,7 @@ static void DiagnoseNonTriviallyCopyableReason(Sema &SemaRef,
           << Decl->isMoveAssignmentOperator() << Decl->getSourceRange();
   }
   CXXDestructorDecl *Dtr = D->getDestructor();
-  if (Dtr && Dtr->isUserProvided() && !Dtr->isDefaulted())
+  if (Dtr && !Dtr->isTrivial())
     SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
         << diag::TraitNotSatisfiedReason::DeletedDtr << 1
         << Dtr->getSourceRange();

clang/test/SemaCXX/type-traits-unsatisfied-diags.cpp

@@ -184,21 +184,6 @@ struct S3 {
 };
 static_assert(__is_trivially_copyable(S3));
 
-union U { // #tc-U
-    U(const U&);
-    U(U&&);
-    U& operator=(const U&);
-    U& operator=(U&&);
-};
-static_assert(__is_trivially_copyable(U));
-// expected-error@-1 {{static assertion failed due to requirement '__is_trivially_copyable(trivially_copyable::U)'}} \
-// expected-note@-1 {{'U' is not trivially copyable}} \
-// expected-note@-1 {{because it is a union with a user-declared copy constructor}} \
-// expected-note@-1 {{because it is a union with a user-declared copy assignment operator}} \
-// expected-note@-1 {{because it is a union with a user-declared move constructor}} \
-// expected-note@-1 {{because it is a union with a user-declared move assignment operator}}
-// expected-note@#tc-U {{'U' defined here}}
-
 struct S4 { // #tc-S4
     ~S4();
     B b;
@@ -209,18 +194,4 @@ static_assert(__is_trivially_copyable(S4));
 // expected-note@-1 {{because it has a non-trivially-copyable member 'b' of type 'B'}} \
 // expected-note@-1 {{because it has a user-provided destructor}} \
 // expected-note@#tc-S4 {{'S4' defined here}}
-
-union U2 { // #tc-U2
-    U2(const U2&);
-    U2(U2&&);
-    B b;
-};
-static_assert(__is_trivially_copyable(U2));
-// expected-error@-1 {{static assertion failed due to requirement '__is_trivially_copyable(trivially_copyable::U2)'}} \
-// expected-note@-1 {{'U2' is not trivially copyable}} \
-// expected-note@-1 {{because it is a union with a user-declared copy constructor}} \
-// expected-note@-1 {{because it is a union with a user-declared move constructor}} \
-// expected-note@-1 {{because it has a deleted destructor}} \
-// expected-note@-1 {{because it has a non-trivially-copyable member 'b' of type 'B'}} \
-// expected-note@#tc-U2 {{'U2' defined here}}
 }