improve attribute checking with a simplified helper

Author: a-tarasyuk

clang/include/clang/Basic/AttributeCommonInfo.h

@@ -15,6 +15,7 @@
 #define LLVM_CLANG_BASIC_ATTRIBUTECOMMONINFO_H
 
 #include "clang/Basic/SourceLocation.h"
+#include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/TokenKinds.h"
 
 namespace clang {
@@ -248,6 +249,9 @@ class AttributeCommonInfo {
 
   static AttrArgsInfo getCXX11AttrArgsInfo(const IdentifierInfo *Name);
 
+  static bool hasCXX11Attr(const IdentifierInfo *Name, const TargetInfo &Target,
+                           const LangOptions &LangOpts);
+
 private:
   /// Get an index into the attribute spelling list
   /// defined in Attr.td. This index is used by an attribute

clang/lib/Basic/Attributes.cpp

@@ -153,14 +153,24 @@ AttributeCommonInfo::getParsedKind(const IdentifierInfo *Name,
 
 AttributeCommonInfo::AttrArgsInfo
 AttributeCommonInfo::getCXX11AttrArgsInfo(const IdentifierInfo *Name) {
+  StringRef AttrName =
+      normalizeAttrName(Name, /*NormalizedScopeName*/ "", Syntax::AS_CXX11);
 #define CXX11_ATTR_ARGS_INFO
-  return llvm::StringSwitch<AttributeCommonInfo::AttrArgsInfo>(
-             normalizeName(Name, /*Scope*/ nullptr, Syntax::AS_CXX11))
+  return llvm::StringSwitch<AttributeCommonInfo::AttrArgsInfo>(AttrName)
 #include "clang/Basic/CXX11AttributeInfo.inc"
       .Default(AttributeCommonInfo::AttrArgsInfo::None);
 #undef CXX11_ATTR_ARGS_INFO
 }
 
+bool AttributeCommonInfo::hasCXX11Attr(const IdentifierInfo *Name,
+                                       const TargetInfo &Target,
+                                       const LangOptions &LangOpts) {
+  StringRef AttrName =
+      normalizeAttrName(Name, /*NormalizedScopeName*/ "", Syntax::AS_CXX11);
+  return hasAttributeImpl(Syntax::AS_CXX11, AttrName, /*ScopeName*/ "", Target,
+                          LangOpts) > 0;
+}
+
 std::string AttributeCommonInfo::getNormalizedFullName() const {
   return static_cast<std::string>(
       normalizeName(getAttrName(), getScopeName(), getSyntax()));

clang/lib/Lex/PPDirectives.cpp

@@ -179,8 +179,7 @@ static bool isLanguageDefinedBuiltin(const SourceManager &SourceMgr,
 static bool isReservedCXXAttributeName(Preprocessor &PP, IdentifierInfo *II) {
   const LangOptions &Lang = PP.getLangOpts();
   if (Lang.CPlusPlus &&
-      hasAttribute(AttributeCommonInfo::Syntax::AS_CXX11, /*Scope*/ nullptr, II,
-                   PP.getTargetInfo(), Lang) > 0) {
+      AttributeCommonInfo::hasCXX11Attr(II, PP.getTargetInfo(), Lang)) {
     AttributeCommonInfo::AttrArgsInfo AttrArgsInfo =
         AttributeCommonInfo::getCXX11AttrArgsInfo(II);
     if (AttrArgsInfo == AttributeCommonInfo::AttrArgsInfo::Required)