Remove placeholder attr name for annotation

Signed-off-by: acassagnes <acassagnes@bloomberg.net>

Author: zebullax

clang/include/clang/Basic/AttributeCommonInfo.h

@@ -193,6 +193,7 @@ class AttributeCommonInfo {
     return Form(getSyntax(), SpellingIndex, IsAlignas,
                 IsRegularKeywordAttribute);
   }
+
   const IdentifierInfo *getAttrName() const { return AttrName; }
   void setAttrName(const IdentifierInfo *AttrNameII) { AttrName = AttrNameII; }
   SourceLocation getLoc() const { return AttrRange.getBegin(); }

clang/include/clang/Sema/ParsedAttr.h

@@ -216,6 +216,20 @@ class ParsedAttr final
       memcpy(getArgsBuffer(), args, numArgs * sizeof(ArgsUnion));
   }
 
+  /// Constructor for an annotation with expression argument
+  ParsedAttr(SourceRange attrRange, AttributeScopeInfo scope, ArgsUnion *args,
+             unsigned numArgs, Form formUsed, SourceLocation ellipsisLoc)
+      : AttributeCommonInfo(attrRange, ParsedAttr::Kind::AT_CXX26Annotation,
+                            ParsedAttr::Form::Annotation()),
+        EllipsisLoc(ellipsisLoc), NumArgs(numArgs), Invalid(false),
+        UsedAsTypeAttr(false), IsAvailability(false),
+        IsTypeTagForDatatype(false), IsProperty(false), HasParsedType(false),
+        HasProcessingCache(false), IsPragmaClangAttribute(false),
+        Info(ParsedAttrInfo::get(*this)) {
+    assert(numArgs == 1);
+    memcpy(getArgsBuffer(), args, sizeof(ArgsUnion));
+  }
+
   /// Constructor for availability attributes.
   ParsedAttr(IdentifierInfo *attrName, SourceRange attrRange,
              AttributeScopeInfo scope, IdentifierLoc *Parm,
@@ -504,6 +518,7 @@ class ParsedAttr final
   /// error. Returns false if a diagnostic is produced.
   bool checkAtMostNumArgs(class Sema &S, unsigned Num) const;
 
+  bool isAnnotationAttr() const;
   bool isTargetSpecificAttr() const;
   bool isTypeAttr() const;
   bool isStmtAttr() const;
@@ -732,6 +747,22 @@ class AttributePool {
   /// them at the end of this \c AttributePool.
   void takeFrom(ParsedAttributesView &List, AttributePool &Pool);
 
+  // Create a Cxx26 annotation
+  ParsedAttr *create(SourceRange attrRange, AttributeScopeInfo scope,
+                     ArgsUnion *args, unsigned numArgs, ParsedAttr::Form form,
+                     SourceLocation ellipsisLoc = SourceLocation()) {
+    // Only annotations are allowed to pass through without an identifier
+    assert(form.getSyntax() == ParsedAttr::Syntax::AS_Annotation);
+
+    void *memory = allocate(
+        ParsedAttr::totalSizeToAlloc<ArgsUnion, detail::AvailabilityData,
+                                     detail::TypeTagForDatatypeData, ParsedType,
+                                     detail::PropertyData>(numArgs, 0, 0, 0,
+                                                           0));
+    return add(new (memory) ParsedAttr(attrRange, scope, args, numArgs, form,
+                                       ellipsisLoc));
+  }
+
   ParsedAttr *create(IdentifierInfo *attrName, SourceRange attrRange,
                      AttributeScopeInfo scope, ArgsUnion *args,
                      unsigned numArgs, ParsedAttr::Form form,
@@ -974,6 +1005,16 @@ class ParsedAttributes : public ParsedAttributesView {
     Range = SourceRange();
   }
 
+  /// Add annotation with expression argument
+  ParsedAttr *addNew(SourceRange attrRange, AttributeScopeInfo scope,
+                     ArgsUnion *args, unsigned numArgs, ParsedAttr::Form form,
+                     SourceLocation ellipsisLoc = SourceLocation()) {
+    ParsedAttr *attr =
+        pool.create(attrRange, scope, args, numArgs, form, ellipsisLoc);
+    addAtEnd(attr);
+    return attr;
+  }
+
   /// Add attribute with expression arguments.
   ParsedAttr *addNew(IdentifierInfo *attrName, SourceRange attrRange,
                      AttributeScopeInfo scope, ArgsUnion *args,

clang/lib/Parse/ParseDeclCXX.cpp

@@ -4452,13 +4452,9 @@ void Parser::ParseAnnotationSpecifier(ParsedAttributes &Attrs,
   if (AnnotExpr.isInvalid() || AnnotExpr.get()->containsErrors())
     return;
 
-  IdentifierTable &IT = Actions.PP.getIdentifierTable();
-  IdentifierInfo &Placeholder = IT.get("__annotation_placeholder");
-
   ArgsVector ArgExprs;
   ArgExprs.push_back(AnnotExpr.get());
-  Attrs.addNew(&Placeholder, EqLoc, {}, ArgExprs.data(), 1,
-               ParsedAttr::Form::Annotation());
+  Attrs.addNew(EqLoc, {}, ArgExprs.data(), 1, ParsedAttr::Form::Annotation());
 
   if (EndLoc)
     *EndLoc = AnnotExpr.get()->getEndLoc();

clang/lib/Sema/ParsedAttr.cpp

@@ -203,6 +203,10 @@ bool ParsedAttr::isTargetSpecificAttr() const {
   return getInfo().IsTargetSpecific;
 }
 
+bool ParsedAttr::isAnnotationAttr() const {
+  return getParsedKind() == AT_CXX26Annotation;
+}
+
 bool ParsedAttr::isTypeAttr() const { return getInfo().IsType; }
 
 bool ParsedAttr::isStmtAttr() const { return getInfo().IsStmt; }
@@ -213,8 +217,8 @@ bool ParsedAttr::existsInTarget(const TargetInfo &Target) const {
   // If the attribute has a target-specific spelling, check that it exists.
   // Only call this if the attr is not ignored/unknown. For most targets, this
   // function just returns true.
-  bool HasSpelling = K != IgnoredAttribute && K != UnknownAttribute &&
-                     K != NoSemaHandlerAttribute;
+  bool HasSpelling = !isAnnotationAttr() && K != IgnoredAttribute &&
+                     K != UnknownAttribute && K != NoSemaHandlerAttribute;
   bool TargetSpecificSpellingExists =
       !HasSpelling ||
       getInfo().spellingExistsInTarget(Target, getAttributeSpellingListIndex());