Merge pull request #78743 from tshortli/embedded-swift-availability-domain

tshortli · web-flow · commit 40b3fccc08ad · 2025-01-20T15:00:17.000-08:00
AST: Model Embedded Swift availability with a domain
diff --git a/include/swift/AST/Attr.h b/include/swift/AST/Attr.h
@@ -151,7 +151,7 @@ class DeclAttribute : public AttributeBase {
       Value : 32
     );
 
-    SWIFT_INLINE_BITFIELD(AvailableAttr, DeclAttribute, 4+1+1+1+1,
+    SWIFT_INLINE_BITFIELD(AvailableAttr, DeclAttribute, 4+1+1+1,
       /// An `AvailableAttr::Kind` value.
       Kind : 4,
 
@@ -160,10 +160,7 @@ class DeclAttribute : public AttributeBase {
       HasRenamedDecl : 1,
 
       /// Whether this attribute was spelled `@_spi_available`.
-      IsSPI : 1,
-
-      /// Whether this attribute was spelled `@_unavailableInEmbedded`.
-      IsForEmbedded : 1
+      IsSPI : 1
     );
 
     SWIFT_INLINE_BITFIELD(ClangImporterSynthesizedTypeAttr, DeclAttribute, 1,
@@ -741,7 +738,7 @@ class AvailableAttr : public DeclAttribute {
                 const llvm::VersionTuple &Deprecated,
                 SourceRange DeprecatedRange,
                 const llvm::VersionTuple &Obsoleted, SourceRange ObsoletedRange,
-                bool Implicit, bool IsSPI, bool IsForEmbedded = false);
+                bool Implicit, bool IsSPI);
 
   /// The optional message.
   const StringRef Message;
@@ -789,9 +786,6 @@ class AvailableAttr : public DeclAttribute {
   /// Whether this attribute was spelled `@_spi_available`.
   bool isSPI() const { return Bits.AvailableAttr.IsSPI; }
 
-  /// Whether this attribute was spelled `@_unavailableInEmbedded`.
-  bool isForEmbedded() const { return Bits.AvailableAttr.IsForEmbedded; }
-
   /// Returns the `AvailabilityDomain` associated with the attribute, or
   /// `std::nullopt` if it has either not yet been resolved or could not be
   /// resolved successfully.
@@ -3277,8 +3271,8 @@ class SemanticAvailableAttr final {
     return getDomain().isPackageDescription() && isVersionSpecific();
   }
 
-  /// Whether this attribute was spelled `@_unavailableInEmbedded`.
-  bool isEmbeddedSpecific() const { return attr->isForEmbedded(); }
+  /// Whether this attribute an attribute that is specific to Embedded Swift.
+  bool isEmbeddedSpecific() const { return getDomain().isEmbedded(); }
 
   /// Returns the active version from the AST context corresponding to
   /// the available kind. For example, this will return the effective language
diff --git a/include/swift/AST/AvailabilityDomain.h b/include/swift/AST/AvailabilityDomain.h
@@ -41,6 +41,9 @@ class AvailabilityDomain final {
     /// Represents PackageDescription availability.
     PackageDescription,
 
+    /// Represents Embedded Swift availability.
+    Embedded,
+
     /// Represents availability for a specific operating system platform.
     Platform,
   };
@@ -132,6 +135,10 @@ class AvailabilityDomain final {
     return AvailabilityDomain(Kind::PackageDescription);
   }
 
+  static AvailabilityDomain forEmbedded() {
+    return AvailabilityDomain(Kind::Embedded);
+  }
+
   Kind getKind() const {
     if (auto inlineDomain = getInlineDomain())
       return inlineDomain->getKind();
@@ -149,6 +156,8 @@ class AvailabilityDomain final {
     return getKind() == Kind::PackageDescription;
   }
 
+  bool isEmbedded() const { return getKind() == Kind::Embedded; }
+
   /// Returns the platform kind for this domain if applicable.
   PlatformKind getPlatformKind() const {
     if (auto inlineDomain = getInlineDomain())
@@ -184,6 +193,7 @@ class AvailabilityDomain final {
     case Kind::Universal:
     case Kind::SwiftLanguage:
     case Kind::PackageDescription:
+    case Kind::Embedded:
       // These availability domains are singletons.
       return false;
     case Kind::Platform:
diff --git a/lib/AST/Attr.cpp b/lib/AST/Attr.cpp
@@ -1187,7 +1187,7 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
       Printer << ", unavailable)";
       break;
     }
-    if (Attr->getParsedAttr()->isForEmbedded()) {
+    if (Attr->isEmbeddedSpecific()) {
       std::string atUnavailableInEmbedded =
           (llvm::Twine("@") + UNAVAILABLE_IN_EMBEDDED_ATTRNAME).str();
       Printer.printAttrName(atUnavailableInEmbedded);
@@ -2094,7 +2094,7 @@ AvailableAttr::AvailableAttr(
     const llvm::VersionTuple &Introduced, SourceRange IntroducedRange,
     const llvm::VersionTuple &Deprecated, SourceRange DeprecatedRange,
     const llvm::VersionTuple &Obsoleted, SourceRange ObsoletedRange,
-    bool Implicit, bool IsSPI, bool IsForEmbedded)
+    bool Implicit, bool IsSPI)
     : DeclAttribute(DeclAttrKind::Available, AtLoc, Range, Implicit),
       Domain(Domain), Message(Message), Rename(Rename),
       INIT_VER_TUPLE(Introduced), IntroducedRange(IntroducedRange),
@@ -2104,13 +2104,6 @@ AvailableAttr::AvailableAttr(
   Bits.AvailableAttr.HasComputedRenamedDecl = false;
   Bits.AvailableAttr.HasRenamedDecl = false;
   Bits.AvailableAttr.IsSPI = IsSPI;
-
-  if (IsForEmbedded) {
-    // FIXME: [availability] The IsForEmbedded bit should be removed when
-    // it can be represented with AvailabilityDomain (rdar://138802876)
-    Bits.AvailableAttr.IsForEmbedded = true;
-    assert(Domain.isUniversal());
-  }
 }
 
 #undef INIT_VER_TUPLE
@@ -2180,16 +2173,15 @@ bool BackDeployedAttr::isActivePlatform(const ASTContext &ctx,
 }
 
 AvailableAttr *AvailableAttr::clone(ASTContext &C, bool implicit) const {
-  return new (C) AvailableAttr(implicit ? SourceLoc() : AtLoc,
-                               implicit ? SourceRange() : getRange(), Domain,
-                               getKind(), Message, Rename,
-                               Introduced ? *Introduced : llvm::VersionTuple(),
-                               implicit ? SourceRange() : IntroducedRange,
-                               Deprecated ? *Deprecated : llvm::VersionTuple(),
-                               implicit ? SourceRange() : DeprecatedRange,
-                               Obsoleted ? *Obsoleted : llvm::VersionTuple(),
-                               implicit ? SourceRange() : ObsoletedRange,
-                               implicit, isSPI(), isForEmbedded());
+  return new (C) AvailableAttr(
+      implicit ? SourceLoc() : AtLoc, implicit ? SourceRange() : getRange(),
+      Domain, getKind(), Message, Rename,
+      Introduced ? *Introduced : llvm::VersionTuple(),
+      implicit ? SourceRange() : IntroducedRange,
+      Deprecated ? *Deprecated : llvm::VersionTuple(),
+      implicit ? SourceRange() : DeprecatedRange,
+      Obsoleted ? *Obsoleted : llvm::VersionTuple(),
+      implicit ? SourceRange() : ObsoletedRange, implicit, isSPI());
 }
 
 std::optional<OriginallyDefinedInAttr::ActiveVersion>
diff --git a/lib/AST/AvailabilityDomain.cpp b/lib/AST/AvailabilityDomain.cpp
@@ -21,6 +21,7 @@ bool AvailabilityDomain::isActive(const ASTContext &ctx) const {
   case Kind::Universal:
   case Kind::SwiftLanguage:
   case Kind::PackageDescription:
+  case Kind::Embedded:
     return true;
   case Kind::Platform:
     return isPlatformActive(getPlatformKind(), ctx.LangOpts);
@@ -35,6 +36,8 @@ llvm::StringRef AvailabilityDomain::getNameForDiagnostics() const {
     return "Swift";
   case Kind::PackageDescription:
     return "PackageDescription";
+  case Kind::Embedded:
+    return "Embedded Swift";
   case Kind::Platform:
     return swift::prettyPlatformString(getPlatformKind());
   }
@@ -48,6 +51,8 @@ llvm::StringRef AvailabilityDomain::getNameForAttributePrinting() const {
     return "swift";
   case Kind::PackageDescription:
     return "_PackageDescription";
+  case Kind::Embedded:
+    return "Embedded";
   case Kind::Platform:
     return swift::platformString(getPlatformKind());
   }
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -4392,12 +4392,11 @@ ParserStatus Parser::parseDeclAttribute(DeclAttributes &Attributes,
     if (Context.LangOpts.hasFeature(Feature::Embedded)) {
       StringRef Message = "unavailable in embedded Swift", Renamed;
       auto attr = new (Context) AvailableAttr(
-          AtLoc, SourceRange(AtLoc, attrLoc),
-          AvailabilityDomain::forUniversal(), AvailableAttr::Kind::Unavailable,
-          Message, Renamed, llvm::VersionTuple(), SourceRange(),
+          AtLoc, SourceRange(AtLoc, attrLoc), AvailabilityDomain::forEmbedded(),
+          AvailableAttr::Kind::Unavailable, Message, Renamed,
           llvm::VersionTuple(), SourceRange(), llvm::VersionTuple(),
-          SourceRange(),
-          /*Implicit=*/false, /*IsSPI=*/false, /*IsForEmbedded=*/true);
+          SourceRange(), llvm::VersionTuple(), SourceRange(),
+          /*Implicit=*/false, /*IsSPI=*/false);
       Attributes.add(attr);
     }
     return makeParserSuccess();
diff --git a/lib/Sema/TypeCheckAvailability.cpp b/lib/Sema/TypeCheckAvailability.cpp
@@ -3028,6 +3028,7 @@ class UnavailabilityDiagnosticInfo {
   bool shouldHideDomainNameInUnversionedDiagnostics() const {
     switch (getDomain().getKind()) {
     case AvailabilityDomain::Kind::Universal:
+    case AvailabilityDomain::Kind::Embedded:
       return true;
     case AvailabilityDomain::Kind::Platform:
       return false;
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -5636,14 +5636,16 @@ DeclDeserializer::readAvailable_DECL_ATTR(SmallVectorImpl<uint64_t> &scratch,
     domain = isPackageDescriptionVersionSpecific
                  ? AvailabilityDomain::forPackageDescription()
                  : AvailabilityDomain::forSwiftLanguage();
+  } else if (isForEmbedded) {
+    domain = AvailabilityDomain::forEmbedded();
   } else {
     domain = AvailabilityDomain::forUniversal();
   }
 
   auto attr = new (ctx)
       AvailableAttr(SourceLoc(), SourceRange(), domain, kind, message, rename,
                     Introduced, SourceRange(), Deprecated, SourceRange(),
-                    Obsoleted, SourceRange(), isImplicit, isSPI, isForEmbedded);
+                    Obsoleted, SourceRange(), isImplicit, isSPI);
   return attr;
 }
 
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
@@ -3074,7 +3074,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
           theAttr->isNoAsync(),
           domain->isPackageDescription(),
           theAttr->isSPI(),
-          theAttr->isForEmbedded(),
+          domain->isEmbedded(),
           LIST_VER_TUPLE_PIECES(Introduced),
           LIST_VER_TUPLE_PIECES(Deprecated),
           LIST_VER_TUPLE_PIECES(Obsoleted),
