[ASTGen] Introduce 'AvailableAttr::createUnavailableInEmbedded()'

Author: rintaro

include/swift/AST/ASTBridging.h

@@ -873,23 +873,10 @@ enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedAvailableAttrKind {
   BridgedAvailableAttrKindNoAsync,
 };
 
-SWIFT_NAME(
-    "BridgedAvailableAttr.createParsed(_:atLoc:range:domain:domainLoc:kind:message:"
-    "renamed:introduced:introducedRange:deprecated:deprecatedRange:"
-    "obsoleted:obsoletedRange:)")
-BridgedAvailableAttr BridgedAvailableAttr_createParsed(
-    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
-    BridgedSourceRange cRange, BridgedAvailabilityDomain cDomain, BridgedSourceLoc cDomainLoc,
-    BridgedAvailableAttrKind cKind, BridgedStringRef cMessage,
-    BridgedStringRef cRenamed, BridgedVersionTuple cIntroduced,
-    BridgedSourceRange cIntroducedRange, BridgedVersionTuple cDeprecated,
-    BridgedSourceRange cDeprecatedRange, BridgedVersionTuple cObsoleted,
-    BridgedSourceRange cObsoletedRange);
-
 SWIFT_NAME("BridgedAvailableAttr.createParsed(_:atLoc:range:domainIdentifier:"
            "domainLoc:kind:message:renamed:introduced:introducedRange:"
            "deprecated:deprecatedRange:obsoleted:obsoletedRange:)")
-BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
+BridgedAvailableAttr BridgedAvailableAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedIdentifier cDomainIdentifier,
     BridgedSourceLoc cDomainLoc, BridgedAvailableAttrKind cKind,
@@ -898,6 +885,12 @@ BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
     BridgedVersionTuple cDeprecated, BridgedSourceRange cDeprecatedRange,
     BridgedVersionTuple cObsoleted, BridgedSourceRange cObsoletedRange);
 
+SWIFT_NAME("BridgedAvailableAttr.createUnavailableInEmbedded(_:atLoc:range:)")
+BridgedAvailableAttr
+BridgedAvailableAttr_createUnavailableInEmbedded(BridgedASTContext cContext,
+                                                 BridgedSourceLoc cAtLoc,
+                                                 BridgedSourceRange cRange);
+
 SWIFT_NAME("BridgedAvailableAttr.setIsGroupMember(self:)")
 void BridgedAvailableAttr_setIsGroupMember(BridgedAvailableAttr cAttr);
 SWIFT_NAME("BridgedAvailableAttr.setIsGroupedWithWildcard(self:)")

include/swift/AST/Attr.h

@@ -888,6 +888,11 @@ class AvailableAttr : public DeclAttribute {
       llvm::VersionTuple Introduced, llvm::VersionTuple Deprecated,
       llvm::VersionTuple Obsoleted);
 
+  /// Create an `AvailableAttr` for `@_unavailableInEmbedded`.
+  static AvailableAttr *createUnavailableInEmbedded(ASTContext &ctx,
+                                                    SourceLoc AtLoc,
+                                                    SourceRange Range);
+
   AvailableAttr *clone(ASTContext &C, bool implicit) const;
   AvailableAttr *clone(ASTContext &C) const {
     return clone(C, isImplicit());

lib/AST/Attr.cpp

@@ -2208,6 +2208,19 @@ AvailableAttr *AvailableAttr::createPlatformVersioned(
       /*SPI=*/false);
 }
 
+AvailableAttr *AvailableAttr::createUnavailableInEmbedded(ASTContext &C,
+                                                          SourceLoc AtLoc,
+                                                          SourceRange Range) {
+  return new (C) AvailableAttr(
+      AtLoc, Range, AvailabilityDomain::forEmbedded(), SourceLoc(),
+      AvailableAttr::Kind::Unavailable, "unavailable in embedded Swift",
+      /*Rename=*/StringRef(),
+      /*Introduced=*/llvm::VersionTuple(), /*IntroducedRange=*/{},
+      /*Deprecated=*/llvm::VersionTuple(), /*DeprecatedRange=*/{},
+      /*Obsoleted=*/llvm::VersionTuple(), /*ObsoletedRange=*/{},
+      /*Implicit=*/false, /*IsSPI=*/false);
+}
+
 bool BackDeployedAttr::isActivePlatform(const ASTContext &ctx,
                                         bool forTargetVariant) const {
   return isPlatformActive(Platform, ctx.LangOpts, forTargetVariant);

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -130,25 +130,6 @@ static AvailableAttr::Kind unbridge(BridgedAvailableAttrKind value) {
 }
 
 BridgedAvailableAttr BridgedAvailableAttr_createParsed(
-    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
-    BridgedSourceRange cRange, BridgedAvailabilityDomain cDomain,
-    BridgedSourceLoc cDomainLoc, BridgedAvailableAttrKind cKind,
-    BridgedStringRef cMessage, BridgedStringRef cRenamed,
-    BridgedVersionTuple cIntroduced, BridgedSourceRange cIntroducedRange,
-    BridgedVersionTuple cDeprecated, BridgedSourceRange cDeprecatedRange,
-    BridgedVersionTuple cObsoleted, BridgedSourceRange cObsoletedRange) {
-  return new (cContext.unbridged())
-      AvailableAttr(cAtLoc.unbridged(), cRange.unbridged(), cDomain.unbridged(),
-                    cDomainLoc.unbridged(), unbridge(cKind),
-                    cMessage.unbridged(), cRenamed.unbridged(),
-                    cIntroduced.unbridged(), cIntroducedRange.unbridged(),
-                    cDeprecated.unbridged(), cDeprecatedRange.unbridged(),
-                    cObsoleted.unbridged(), cObsoletedRange.unbridged(),
-                    /*Implicit=*/false,
-                    /*IsSPI=*/false);
-}
-
-BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedIdentifier cDomainIdentifier,
     BridgedSourceLoc cDomainLoc, BridgedAvailableAttrKind cKind,
@@ -168,6 +149,14 @@ BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
                     /*IsSPI=*/false);
 }
 
+BridgedAvailableAttr
+BridgedAvailableAttr_createUnavailableInEmbedded(BridgedASTContext cContext,
+                                                 BridgedSourceLoc cAtLoc,
+                                                 BridgedSourceRange cRange) {
+  return AvailableAttr::createUnavailableInEmbedded(
+      cContext.unbridged(), cAtLoc.unbridged(), cRange.unbridged());
+}
+
 void BridgedAvailableAttr_setIsGroupMember(BridgedAvailableAttr cAttr) {
   cAttr.unbridged()->setIsGroupMember();
 }

lib/ASTGen/Sources/ASTGen/Availability.swift

@@ -311,6 +311,7 @@ extension ASTGenVisitor {
         if !expanded.isEmpty {
           expanded.withElements(ofType: UnsafeRawPointer.self) { buffer in
             for ptr in buffer {
+              // TODO: Clone and spec.setMacroLoc().
               result.append(BridgedAvailabilitySpec(raw: UnsafeMutableRawPointer(mutating: ptr)))
             }
           }

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -2120,21 +2120,10 @@ extension ASTGenVisitor {
 
   func generateUnavailableInEmbeddedAttr(attribute node: AttributeSyntax) -> BridgedAvailableAttr? {
     if ctx.langOptsHasFeature(.Embedded) {
-      return BridgedAvailableAttr.createParsed(
+      return BridgedAvailableAttr.createUnavailableInEmbedded(
         self.ctx,
         atLoc: self.generateSourceLoc(node.atSign),
-        range: self.generateAttrSourceRange(node),
-        domain: .forEmbedded(),
-        domainLoc: nil,
-        kind: .unavailable,
-        message: "unavailable in embedded Swift",
-        renamed: "",
-        introduced: BridgedVersionTuple(),
-        introducedRange: BridgedSourceRange(),
-        deprecated: BridgedVersionTuple(),
-        deprecatedRange:  BridgedSourceRange(),
-        obsoleted: BridgedVersionTuple(),
-        obsoletedRange: BridgedSourceRange()
+        range: self.generateAttrSourceRange(node)
       )
     } else {
       // For non-Embedded mode, ignore it.

lib/Parse/ParseDecl.cpp

@@ -4299,13 +4299,8 @@ ParserStatus Parser::parseDeclAttribute(DeclAttributes &Attributes,
   if (!DK && Tok.getText() == UNAVAILABLE_IN_EMBEDDED_ATTRNAME) {
     SourceLoc attrLoc = consumeToken();
     if (Context.LangOpts.hasFeature(Feature::Embedded)) {
-      StringRef Message = "unavailable in embedded Swift", Renamed;
-      auto attr = new (Context) AvailableAttr(
-          AtLoc, SourceRange(AtLoc, attrLoc), AvailabilityDomain::forEmbedded(),
-          SourceLoc(), AvailableAttr::Kind::Unavailable, Message, Renamed,
-          llvm::VersionTuple(), SourceRange(), llvm::VersionTuple(),
-          SourceRange(), llvm::VersionTuple(), SourceRange(),
-          /*Implicit=*/false, /*IsSPI=*/false);
+      auto attr = AvailableAttr::createUnavailableInEmbedded(
+          Context, AtLoc, SourceRange(AtLoc, attrLoc));
       Attributes.add(attr);
     }
     return makeParserSuccess();