[Macros] Remove the @declaration attribute.

DougGregor · DougGregor · commit af7ce9e945bd · 2023-01-25T17:07:38.000-08:00
We have @freestanding working appropriately now.
diff --git a/include/swift/AST/Attr.h b/include/swift/AST/Attr.h
@@ -2307,40 +2307,6 @@ class ObjCImplementationAttr final : public DeclAttribute {
   }
 };
 
-class DeclarationAttr final
-    : public DeclAttribute,
-      private llvm::TrailingObjects<DeclarationAttr, MacroIntroducedDeclName> {
-  friend TrailingObjects;
-
-  MacroRole role;
-  unsigned numPeerNames, numMemberNames;
-
-  DeclarationAttr(SourceLoc atLoc, SourceRange range, MacroRole role,
-                  ArrayRef<MacroIntroducedDeclName> peerNames,
-                  ArrayRef<MacroIntroducedDeclName> memberNames,
-                  bool implicit);
-
-public:
-  static DeclarationAttr *create(ASTContext &ctx, SourceLoc atLoc,
-                                 SourceRange range, MacroRole role,
-                                 ArrayRef<MacroIntroducedDeclName> peerNames,
-                                 ArrayRef<MacroIntroducedDeclName> memberNames,
-                                 bool implicit);
-
-  size_t numTrailingObjects(OverloadToken<MacroIntroducedDeclName>) const {
-    return numPeerNames + numMemberNames;
-  }
-
-  MacroRole getMacroRole() const { return role; }
-  ArrayRef<MacroIntroducedDeclName> getPeerAndMemberNames() const;
-  ArrayRef<MacroIntroducedDeclName> getPeerNames() const;
-  ArrayRef<MacroIntroducedDeclName> getMemberNames() const;
-
-  static bool classof(const DeclAttribute *DA) {
-    return DA->getKind() == DAK_Declaration;
-  }
-};
-
 /// A macro role attribute, spelled with either @attached or @freestanding,
 /// which declares one of the roles that a given macro can inhabit.
 class MacroRoleAttr final
diff --git a/include/swift/AST/MacroDeclaration.h b/include/swift/AST/MacroDeclaration.h
@@ -39,7 +39,7 @@ enum class MacroRole: uint32_t {
   /// in the source code.
   Expression = 0x01,
   /// A freestanding declaration macro.
-  FreestandingDeclaration = 0x02,
+  Declaration = 0x02,
   /// An attached macro that declares accessors for a variable or subscript
   /// declaration.
   Accessor = 0x04,
diff --git a/include/swift/Parse/Parser.h b/include/swift/Parse/Parser.h
@@ -1101,10 +1101,6 @@ class Parser {
   bool parseDocumentationAttributeArgument(Optional<StringRef> &Metadata,
                                            Optional<AccessLevel> &Visibility);
 
-  /// Parse the @declaration attribute.
-  ParserResult<DeclarationAttr> parseDeclarationAttribute(SourceLoc AtLoc,
-                                                          SourceLoc Loc);
-
   /// Parse the @attached or @freestanding attribute that specifies a macro
   /// role.
   ParserResult<MacroRoleAttr> parseMacroRoleAttribute(
diff --git a/lib/AST/ASTScopeCreation.cpp b/lib/AST/ASTScopeCreation.cpp
@@ -255,7 +255,7 @@ ASTSourceFileScope::ASTSourceFileScope(SourceFile *SF,
     // Determine the parent source location based on the macro role.
     switch (*macroRole) {
     case MacroRole::Expression:
-    case MacroRole::FreestandingDeclaration:
+    case MacroRole::Declaration:
     case MacroRole::Accessor:
     case MacroRole::MemberAttribute:
       parentLoc = expansion.getStartLoc();
diff --git a/lib/AST/Attr.cpp b/lib/AST/Attr.cpp
@@ -1311,15 +1311,6 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
     break;
   }
 
-  case DAK_Declaration: {
-    Printer.printAttrName("@declaration");
-    Printer << "(";
-    auto Attr = cast<DeclarationAttr>(this);
-    Printer << getMacroRoleString(Attr->getMacroRole());
-    Printer << ")";
-    break;
-  }
-
   case DAK_MacroRole: {
     auto Attr = cast<MacroRoleAttr>(this);
     switch (Attr->getMacroSyntax()) {
@@ -1526,8 +1517,6 @@ StringRef DeclAttribute::getAttrName() const {
     return "_expose";
   case DAK_Documentation:
     return "_documentation";
-  case DAK_Declaration:
-    return "declaration";
   case DAK_MacroRole:
     switch (cast<MacroRoleAttr>(this)->getMacroSyntax()) {
     case MacroSyntax::Freestanding:
@@ -2373,52 +2362,6 @@ bool CustomAttr::isAttachedMacro(const Decl *decl) const {
   return macroDecl != nullptr;
 }
 
-DeclarationAttr::DeclarationAttr(SourceLoc atLoc, SourceRange range,
-                                 MacroRole role,
-                                 ArrayRef<MacroIntroducedDeclName> peerNames,
-                                 ArrayRef<MacroIntroducedDeclName> memberNames,
-                                 bool implicit)
-    : DeclAttribute(DAK_Declaration, atLoc, range, implicit),
-      role(role), numPeerNames(peerNames.size()),
-      numMemberNames(memberNames.size()) {
-  auto *trailingNamesBuffer = getTrailingObjects<MacroIntroducedDeclName>();
-  std::uninitialized_copy(peerNames.begin(), peerNames.end(),
-                          trailingNamesBuffer);
-  std::uninitialized_copy(memberNames.begin(), memberNames.end(),
-                          trailingNamesBuffer + peerNames.size());
-}
-
-DeclarationAttr *
-DeclarationAttr::create(ASTContext &ctx, SourceLoc atLoc, SourceRange range,
-                        MacroRole role,
-                        ArrayRef<MacroIntroducedDeclName> peerNames,
-                        ArrayRef<MacroIntroducedDeclName> memberNames,
-                        bool implicit) {
-  unsigned size = totalSizeToAlloc<MacroIntroducedDeclName>(
-      peerNames.size() + memberNames.size());
-  auto *mem = ctx.Allocate(size, alignof(DeclarationAttr));
-  return new (mem) DeclarationAttr(atLoc, range, role, peerNames,
-                                   memberNames, implicit);
-}
-
-ArrayRef<MacroIntroducedDeclName> DeclarationAttr::getPeerAndMemberNames() const {
-  return {
-    getTrailingObjects<MacroIntroducedDeclName>(),
-    numPeerNames + numMemberNames
-  };
-}
-
-ArrayRef<MacroIntroducedDeclName> DeclarationAttr::getPeerNames() const {
-  return {getTrailingObjects<MacroIntroducedDeclName>(), numPeerNames};
-}
-
-ArrayRef<MacroIntroducedDeclName> DeclarationAttr::getMemberNames() const {
-  return {
-    getTrailingObjects<MacroIntroducedDeclName>() + numPeerNames,
-    numMemberNames
-  };
-}
-
 MacroRoleAttr::MacroRoleAttr(SourceLoc atLoc, SourceRange range,
                              MacroSyntax syntax, MacroRole role,
                              ArrayRef<MacroIntroducedDeclName> names,
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -9717,7 +9717,7 @@ StringRef swift::getMacroRoleString(MacroRole role) {
   case MacroRole::Expression:
     return "expression";
 
-  case MacroRole::FreestandingDeclaration:
+  case MacroRole::Declaration:
     return "freestanding";
 
   case MacroRole::Accessor:
@@ -9769,7 +9769,7 @@ StringRef swift::getMacroIntroducedDeclNameString(
 static MacroRoles freestandingMacroRoles =
   (MacroRoles() |
    MacroRole::Expression |
-   MacroRole::FreestandingDeclaration);
+   MacroRole::Declaration);
 static MacroRoles attachedMacroRoles = (MacroRoles() |
                                         MacroRole::Accessor |
                                         MacroRole::MemberAttribute |
@@ -9825,8 +9825,6 @@ SourceRange MacroDecl::getSourceRange() const {
 
 MacroRoles MacroDecl::getMacroRoles() const {
   MacroRoles contexts = None;
-  for (auto attr : getAttrs().getAttributes<DeclarationAttr>())
-    contexts |= attr->getMacroRole();
   for (auto attr : getAttrs().getAttributes<MacroRoleAttr>())
     contexts |= attr->getMacroRole();
   return contexts;
diff --git a/lib/AST/Module.cpp b/lib/AST/Module.cpp
@@ -907,7 +907,7 @@ Optional<MacroRole> SourceFile::getFulfilledMacroRole() const {
     return MacroRole::Expression;
 
   case GeneratedSourceInfo::FreestandingDeclMacroExpansion:
-    return MacroRole::FreestandingDeclaration;
+    return MacroRole::Declaration;
 
   case GeneratedSourceInfo::AccessorMacroExpansion:
     return MacroRole::Accessor;
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -2145,39 +2145,6 @@ Parser::parseDocumentationAttribute(SourceLoc AtLoc, SourceLoc Loc) {
   return makeParserResult(new (Context) DocumentationAttr(Loc, range, FinalMetadata, Visibility, false));
 }
 
-ParserResult<DeclarationAttr>
-Parser::parseDeclarationAttribute(SourceLoc AtLoc, SourceLoc Loc) {
-  StringRef attrName = "declaration";
-  bool isDeclModifier = DeclAttribute::isDeclModifier(DAK_Declaration);
-  if (!consumeIf(tok::l_paren)) {
-    diagnose(Tok, diag::attr_expected_lparen, attrName, isDeclModifier);
-    return makeParserError();
-  }
-  if (Tok.isNot(tok::identifier)) {
-    diagnose(Tok, diag::declaration_attr_expected_kind);
-    errorAndSkipUntilConsumeRightParen(*this, attrName);
-    return makeParserError();
-  }
-  auto kind = llvm::StringSwitch<Optional<MacroRole>>(Tok.getText())
-      .Case("freestanding", MacroRole::FreestandingDeclaration)
-      .Default(None);
-  if (!kind) {
-    diagnose(Tok, diag::declaration_attr_expected_kind);
-    errorAndSkipUntilConsumeRightParen(*this, attrName);
-    return makeParserError();
-  }
-  consumeToken(tok::identifier);
-  // TODO: Parse peer and member names.
-  SourceLoc rParenLoc;
-  if (!consumeIf(tok::r_paren, rParenLoc)) {
-    diagnose(Tok, diag::attr_expected_rparen, attrName, isDeclModifier);
-    return makeParserError();
-  }
-  SourceRange range(Loc, rParenLoc);
-  return makeParserResult(DeclarationAttr::create(
-      Context, AtLoc, range, *kind, {}, {}, /*isImplicit*/ false));
-}
-
 /// If the given argument is effectively a bare identifier, extract that
 /// identifier.
 static Optional<Identifier> getIdentifierFromArgument(Argument argument) {
@@ -2222,6 +2189,7 @@ static Optional<MacroRole> getMacroRole(
 
   // Match the role string to the known set of roles.
   auto role = llvm::StringSwitch<Optional<MacroRole>>(roleName->str())
+      .Case("declaration", MacroRole::Declaration)
       .Case("expression", MacroRole::Expression)
       .Case("accessor", MacroRole::Accessor)
       .Case("memberAttributes", MacroRole::MemberAttribute)
@@ -3413,14 +3381,6 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
       return false;
     break;
   }
-  case DAK_Declaration: {
-    auto Attr = parseDeclarationAttribute(AtLoc, Loc);
-    if (Attr.isNonNull())
-      Attributes.add(Attr.get());
-    else
-      return false;
-    break;
-  }
   case DAK_MacroRole: {
     auto syntax = (AttrName == "freestanding" ? MacroSyntax::Freestanding
                                               : MacroSyntax::Attached);
@@ -3784,10 +3744,12 @@ ParserStatus Parser::parseDeclAttribute(
     SourceLoc attrLoc = consumeToken();
     diagnose(attrLoc, diag::macro_expression_attribute_removed)
       .fixItReplace(SourceRange(AtLoc, attrLoc), "@freestanding(expression)");
-    return makeParserResult(MacroRoleAttr::create(
+    auto attr = MacroRoleAttr::create(
         Context, AtLoc, SourceRange(AtLoc, attrLoc),
         MacroSyntax::Freestanding, MacroRole::Expression, { },
-        /*isImplicit*/ false));
+        /*isImplicit*/ false);
+    Attributes.add(attr);
+    return makeParserSuccess();
   }
 
   if (DK != DAK_Count && !DeclAttribute::shouldBeRejectedByParser(DK)) {
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -160,7 +160,6 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   IGNORED_ATTR(Preconcurrency)
   IGNORED_ATTR(BackDeploy)
   IGNORED_ATTR(Documentation)
-  IGNORED_ATTR(Declaration)
   IGNORED_ATTR(MacroRole)
 #undef IGNORED_ATTR
 
diff --git a/lib/Sema/TypeCheckDeclOverride.cpp b/lib/Sema/TypeCheckDeclOverride.cpp
@@ -1626,7 +1626,6 @@ namespace  {
 
     UNINTERESTING_ATTR(RuntimeMetadata)
 
-    UNINTERESTING_ATTR(Declaration)
     UNINTERESTING_ATTR(MacroRole)
 #undef UNINTERESTING_ATTR
 
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -3674,7 +3674,7 @@ ExpandMacroExpansionDeclRequest::evaluate(Evaluator &evaluator,
   auto *dc = MED->getDeclContext();
   auto foundMacros = TypeChecker::lookupMacros(
       MED->getDeclContext(), MED->getMacro(),
-      MED->getLoc(), MacroRole::FreestandingDeclaration);
+      MED->getLoc(), MacroRole::Declaration);
   if (foundMacros.empty()) {
     MED->diagnose(diag::macro_undefined, MED->getMacro().getBaseIdentifier())
         .highlight(MED->getMacroLoc().getSourceRange());
diff --git a/lib/Sema/TypeCheckMacros.cpp b/lib/Sema/TypeCheckMacros.cpp
@@ -570,9 +570,9 @@ bool swift::expandFreestandingDeclarationMacro(
 
   MacroDecl *macro = cast<MacroDecl>(med->getMacroRef().getDecl());
   assert(macro->getMacroRoles()
-             .contains(MacroRole::FreestandingDeclaration));
+             .contains(MacroRole::Declaration));
 
-  if (isFromExpansionOfMacro(sourceFile, macro, MacroRole::FreestandingDeclaration)) {
+  if (isFromExpansionOfMacro(sourceFile, macro, MacroRole::Declaration)) {
     med->diagnose(diag::macro_recursive, macro->getName());
     return false;
   }
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -2654,7 +2654,7 @@ getActualMacroRole(uint8_t context) {
   case (uint8_t)serialization::MacroRole::THE_DK: \
     return swift::MacroRole::THE_DK;
   CASE(Expression)
-  CASE(FreestandingDeclaration)
+  CASE(Declaration)
   CASE(Accessor)
   CASE(MemberAttribute)
 #undef CASE
@@ -5421,34 +5421,6 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
         break;
       }
 
-      case decls_block::Declaration_DECL_ATTR: {
-        bool isImplicit;
-        uint8_t rawMacroRole;
-        uint64_t numPeers, numMembers;
-        ArrayRef<uint64_t> introducedDeclNames;
-        serialization::decls_block::DeclarationDeclAttrLayout::
-            readRecord(scratch, isImplicit, rawMacroRole, numPeers,
-                       numMembers, introducedDeclNames);
-        auto role = *getActualMacroRole(rawMacroRole);
-        if (introducedDeclNames.size() != (numPeers + numMembers) * 2)
-          return MF.diagnoseFatal();
-        SmallVector<MacroIntroducedDeclName, 1> peersAndMembers;
-        ArrayRef<MacroIntroducedDeclName> peersAndMembersRef;
-        for (unsigned i = 0; i < introducedDeclNames.size(); i += 2) {
-          auto kind = getActualMacroIntroducedDeclNameKind(
-              (uint8_t)introducedDeclNames[i]);
-          auto identifier =
-              MF.getIdentifier(IdentifierID(introducedDeclNames[i + 1]));
-          peersAndMembers.push_back(MacroIntroducedDeclName(*kind, identifier));
-        }
-        Attr = DeclarationAttr::create(
-            ctx, SourceLoc(), SourceRange(), role,
-            peersAndMembersRef.take_front(numPeers),
-            peersAndMembersRef.take_back(numMembers),
-            isImplicit);
-        break;
-      }
-
       case decls_block::MacroRole_DECL_ATTR: {
         bool isImplicit;
         uint8_t rawMacroSyntax;
diff --git a/lib/Serialization/ModuleFormat.h b/lib/Serialization/ModuleFormat.h
@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 736; // add package access modifier
+const uint16_t SWIFTMODULE_VERSION_MINOR = 737; // macro role attribute
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -610,7 +610,7 @@ enum class GenericEnvironmentKind : uint8_t {
 // the module version.
 enum class MacroRole : uint8_t {
   Expression,
-  FreestandingDeclaration,
+  Declaration,
   Accessor,
   MemberAttribute,
   SynthesizedMembers,
@@ -2217,15 +2217,6 @@ namespace decls_block {
     AccessLevelField    // visibility
   >;
 
-  using DeclarationDeclAttrLayout = BCRecordLayout<
-    Declaration_DECL_ATTR,
-    BCFixed<1>,                // implicit flag
-    MacroRoleField,         // macro context
-    BCVBR<5>,                  // number of peer names
-    BCVBR<5>,                  // number of member names
-    BCArray<IdentifierIDField> // introduced decl name kind and identifier pairs
-  >;
-
   using MacroRoleDeclAttrLayout = BCRecordLayout<
     MacroRole_DECL_ATTR,
     BCFixed<1>,                // implicit flag
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
diff --git a/test/Macros/macro_expand.swift b/test/Macros/macro_expand.swift
diff --git a/test/Macros/macros_diagnostics.swift b/test/Macros/macros_diagnostics.swift
diff --git a/test/Macros/parsing.swift b/test/Macros/parsing.swift
diff --git a/utils/gyb_syntax_support/AttributeKinds.py b/utils/gyb_syntax_support/AttributeKinds.py
