Applied suggestions

Author: to268

clang/lib/Sema/SemaDecl.cpp

@@ -3356,12 +3356,8 @@ void Sema::mergeDeclAttributes(NamedDecl *New, Decl *Old,
 }
 
 void Sema::CheckAttributesOnDeducedType(Decl *D) {
-  if (!D->hasAttrs())
-    return;
-
-  for (const Attr *A : D->getAttrs()) {
+  for (const Attr *A : D->attrs())
     checkAttrIsTypeDependent(D, A);
-  }
 }
 
 // Returns the number of added attributes.

clang/test/SemaCXX/attr-cleanup.cpp

@@ -43,11 +43,12 @@ namespace F {
 
   template <typename Ty>
   void test3() {
-    Ty fd [[gnu::cleanup(close)]] = open(); // expected-error {{'cleanup' function 'close' parameter has type 'decltype(open()) *' (aka 'int *') which is incompatible with type 'float *'}}
+    Ty fd [[gnu::cleanup(close)]] = open(); // #TEST3_CLEANUP
   }
 
   int main() {
     test2<int>();
-    test3<float>(); // expected-note {{in instantiation of function template specialization 'F::test3<float>' requested here}}
+    test3<float>(); // expected-error@#TEST3_CLEANUP {{'cleanup' function 'close' parameter has type 'decltype(open()) *' (aka 'int *') which is incompatible with type 'float *'}} \
+                       expected-note {{in instantiation of function template specialization 'F::test3<float>' requested here}}
   }
 }

clang/utils/TableGen/ClangAttrEmitter.cpp

@@ -5052,15 +5052,15 @@ void EmitClangAttrIsTypeDependent(const RecordKeeper &Records,
 
   OS << "void checkAttrIsTypeDependent(Decl *D, const Attr *A) {\n";
   OS << "  switch (A->getKind()) {\n";
+  OS << "  default:\n";
+  OS << "    break;\n";
   for (const auto *A : Records.getAllDerivedDefinitions("Attr")) {
     if (A->getValueAsBit("IsTypeDependent")) {
       OS << "  case attr::" << A->getName() << ":\n";
       OS << "    ActOn" << A->getName() << "Attr(D, A);\n";
       OS << "    break;\n";
     }
   }
-  OS << "  default:\n";
-  OS << "    break;\n";
   OS << "  }\n";
   OS << "}\n";
 }