remove useless overloads

Author: a-tarasyuk

clang/include/clang/Basic/AttributeCommonInfo.h

@@ -297,43 +297,16 @@ inline bool doesKeywordAttributeTakeArgs(tok::TokenKind Kind) {
   }
 }
 
-inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &DB,
-                                             const AttributeCommonInfo &CI) {
-  DB.AddTaggedVal(reinterpret_cast<uint64_t>(&CI),
-                  DiagnosticsEngine::ak_attr_info);
-  return DB;
-}
-
 inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &DB,
                                              const AttributeCommonInfo *CI) {
   DB.AddTaggedVal(reinterpret_cast<uint64_t>(CI),
                   DiagnosticsEngine::ak_attr_info);
   return DB;
 }
 
-/// AttributeCommonInfo has a non-explicit constructor which takes an
-/// SourceRange as its only argument, this constructor has many uses so making
-/// it explicit is hard. This constructor causes ambiguity with
-/// DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB, SourceRange R).
-/// We use SFINAE to disable any conversion and remove any ambiguity.
-template <
-    typename ACI,
-    std::enable_if_t<std::is_same<ACI, AttributeCommonInfo>::value, int> = 0>
 inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &DB,
-                                             const ACI &CI) {
-  DB.AddTaggedVal(reinterpret_cast<uint64_t>(&CI),
-                  DiagnosticsEngine::ak_attr_info);
-  return DB;
-}
-
-template <
-    typename ACI,
-    std::enable_if_t<std::is_same<ACI, AttributeCommonInfo>::value, int> = 0>
-inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &DB,
-                                             const ACI *CI) {
-  DB.AddTaggedVal(reinterpret_cast<uint64_t>(CI),
-                  DiagnosticsEngine::ak_attr_info);
-  return DB;
+                                             const AttributeCommonInfo &CI) {
+  return DB << &CI;
 }
 
 } // namespace clang

clang/lib/Sema/SemaDeclAttr.cpp

@@ -1225,7 +1225,7 @@ static void handlePreferredName(Sema &S, Decl *D, const ParsedAttr &AL) {
     }
   }
 
-  S.Diag(AL.getLoc(), diag::err_attribute_preferred_name_arg_invalid)
+  S.Diag(AL.getLoc(), diag::err_attribute_not_typedef_for_specialization)
       << T << AL << CTD;
   if (const auto *TT = T->getAs<TypedefType>())
     S.Diag(TT->getDecl()->getLocation(), diag::note_entity_declared_at)
@@ -4146,7 +4146,7 @@ static void handleCallbackAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   }
 
   if (CalleeFnProtoType->getNumParams() != EncodingIndices.size() - 1) {
-    S.Diag(AL.getLoc(), diag::err_callback_attribute_wrong_arg_count)
+    S.Diag(AL.getLoc(), diag::err_attribute_wrong_arg_count_for_func)
         << AL << QualType{CalleeFnProtoType, 0}
         << CalleeFnProtoType->getNumParams()
         << (unsigned)(EncodingIndices.size() - 1);