Swapped bases and fields diagnostics.

Author: egorshamshura

clang/lib/Sema/SemaTypeTraits.cpp

@@ -2660,33 +2660,33 @@ static void DiagnoseNonAggregateReason(Sema &SemaRef, SourceLocation Loc,
         << diag::TraitNotSatisfiedReason::InheritedCtr;
   }
 
-  for (const FieldDecl *Field : D->fields()) {
-    auto AccessSpecifier = Field->getAccess();
+  for (const CXXBaseSpecifier &B : D->bases()) {
+    if (B.isVirtual()) {
+      SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
+          << diag::TraitNotSatisfiedReason::VBase << B.getType()
+          << B.getSourceRange();
+      continue;
+    }
+    auto AccessSpecifier = B.getAccessSpecifier();
     switch (AccessSpecifier) {
     case AS_private:
     case AS_protected:
       SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
-          << diag::TraitNotSatisfiedReason::PrivateProtectedDirectDataMember
+          << diag::TraitNotSatisfiedReason::PrivateProtectedDirectBase
           << (AccessSpecifier == AS_protected);
       break;
     default:
       break;
     }
   }
 
-  for (const CXXBaseSpecifier &B : D->bases()) {
-    if (B.isVirtual()) {
-      SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
-          << diag::TraitNotSatisfiedReason::VBase << B.getType()
-          << B.getSourceRange();
-      continue;
-    }
-    auto AccessSpecifier = B.getAccessSpecifier();
+  for (const FieldDecl *Field : D->fields()) {
+    auto AccessSpecifier = Field->getAccess();
     switch (AccessSpecifier) {
     case AS_private:
     case AS_protected:
       SemaRef.Diag(Loc, diag::note_unsatisfied_trait_reason)
-          << diag::TraitNotSatisfiedReason::PrivateProtectedDirectBase
+          << diag::TraitNotSatisfiedReason::PrivateProtectedDirectDataMember
           << (AccessSpecifier == AS_protected);
       break;
     default: