Fixed case with destructor and added test, fixed typo

Author: egorshamshura

clang/lib/Sema/SemaTypeTraits.cpp

@@ -2107,10 +2107,11 @@ static void DiagnoseNonTriviallyCopyableReason(Sema &SemaRef,
           << diag::TraitNotSatisfiedReason::NTCField << Field
           << Field->getType() << Field->getSourceRange();
   }
-  if (D->hasDeletedDestructor())
+  CXXDestructorDecl *Dtr = D->getDestructor();
+  if (D->hasDeletedDestructor() || (Dtr && !Dtr->isTrivial()))
     SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
-        << diag::TraitNotSatisfiedReason::DeletedDtr << 0
-        << D->getDestructor()->getSourceRange();
+        << diag::TraitNotSatisfiedReason::DeletedDtr
+        << !D->hasDeletedDestructor() << D->getDestructor()->getSourceRange();
 
   for (const CXXMethodDecl *Method : D->methods()) {
     if (Method->isTrivial() || !Method->isUserProvided()) {
@@ -2136,16 +2137,10 @@ static void DiagnoseNonTriviallyCopyableReason(Sema &SemaRef,
           << IsMove << Method->getSourceRange();
       break;
     }
-    default: {
+    default:
       break;
     }
-    }
   }
-  CXXDestructorDecl *Dtr = D->getDestructor();
-  if (Dtr && !Dtr->isTrivial())
-    SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
-        << diag::TraitNotSatisfiedReason::DeletedDtr << 1
-        << Dtr->getSourceRange();
 }
 
 static void DiagnoseNonTriviallyCopyableReason(Sema &SemaRef,

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

@@ -279,4 +279,14 @@ static_assert(__is_trivially_copyable(S11));
 // expected-note@-1 {{because it has a non-trivially-copyable base 'B6'}} \
 // expected-note@-1 {{'S11' is not trivially copyable}} \
 // expected-note@#tc-S11 {{'S11' defined here}}
+
+struct S12 : B6 { // #tc-S12
+    ~S12() = delete;
+};
+static_assert(__is_trivially_copyable(S12));
+// expected-error@-1 {{static assertion failed due to requirement '__is_trivially_copyable(trivially_copyable::S12)'}} \
+// expected-note@-1 {{because it has a non-trivially-copyable base 'B6'}} \
+// expected-note@-1 {{because it has a deleted destructor}} \
+// expected-note@-1 {{'S12' is not trivially copyable}} \
+// expected-note@#tc-S12 {{'S12' defined here}}
 }