AST: Add AvailabilityContext::containsUnavailableDomain().

Replaces AvailabilityContext::getUnavailableDomain().

Author: tshortli

include/swift/AST/AvailabilityContext.h

@@ -74,12 +74,11 @@ class AvailabilityContext {
   /// availability context, starting at its introduction version.
   AvailabilityRange getPlatformRange() const;
 
-  /// Returns the broadest AvailabilityDomain that is unavailable in this
-  /// context.
-  std::optional<AvailabilityDomain> getUnavailableDomain() const;
+  /// Returns true if this context contains any unavailable domains.
+  bool isUnavailable() const;
 
-  /// Returns true if this context is unavailable.
-  bool isUnavailable() const { return getUnavailableDomain().has_value(); }
+  /// Returns true if \p domain is unavailable in this context.
+  bool containsUnavailableDomain(AvailabilityDomain domain) const;
 
   /// Returns true if this context is deprecated on the current platform.
   bool isDeprecated() const;

lib/AST/AvailabilityContext.cpp

@@ -133,9 +133,16 @@ AvailabilityRange AvailabilityContext::getPlatformRange() const {
   return storage->info.Range;
 }
 
-std::optional<AvailabilityDomain>
-AvailabilityContext::getUnavailableDomain() const {
-  return storage->info.UnavailableDomain;
+bool AvailabilityContext::isUnavailable() const {
+  return storage->info.UnavailableDomain.has_value();
+}
+
+bool AvailabilityContext::containsUnavailableDomain(
+    AvailabilityDomain domain) const {
+  if (auto unavailableDomain = storage->info.UnavailableDomain)
+    return unavailableDomain->contains(domain);
+
+  return false;
 }
 
 bool AvailabilityContext::isDeprecated() const {
@@ -212,7 +219,7 @@ stringForAvailability(const AvailabilityRange &availability) {
 void AvailabilityContext::print(llvm::raw_ostream &os) const {
   os << "version=" << stringForAvailability(getPlatformRange());
 
-  if (auto unavailableDomain = getUnavailableDomain())
+  if (auto unavailableDomain = storage->info.UnavailableDomain)
     os << " unavailable=" << unavailableDomain->getNameForAttributePrinting();
 
   if (isDeprecated())

lib/Sema/TypeCheckAttr.cpp

@@ -5125,34 +5125,33 @@ void AttributeChecker::checkBackDeployedAttrs(
         D->getLoc(), D->getInnermostDeclContext());
 
     // Unavailable decls cannot be back deployed.
-    if (auto unavailableDomain = availability.getUnavailableDomain()) {
-      auto backDeployedDomain = AvailabilityDomain::forPlatform(Attr->Platform);
-      if (unavailableDomain->contains(backDeployedDomain)) {
-        auto platformString = prettyPlatformString(Attr->Platform);
-        llvm::VersionTuple ignoredVersion;
-
-        AvailabilityInference::updateBeforePlatformForFallback(
-            Attr, Ctx, platformString, ignoredVersion);
-
-        diagnose(AtLoc, diag::attr_has_no_effect_on_unavailable_decl, Attr, VD,
-                 platformString);
-
-        // Find the attribute that makes the declaration unavailable.
-        const Decl *attrDecl = D;
-        do {
-          if (auto unavailableAttr = attrDecl->getUnavailableAttr()) {
-            diagnose(unavailableAttr->getParsedAttr()->AtLoc,
-                     diag::availability_marked_unavailable, VD)
-                .highlight(unavailableAttr->getParsedAttr()->getRange());
-            break;
-          }
+    auto backDeployedDomain = AvailabilityDomain::forPlatform(Attr->Platform);
+    if (auto unavailableDomain =
+            availability.containsUnavailableDomain(backDeployedDomain)) {
+      auto platformString = prettyPlatformString(Attr->Platform);
+      llvm::VersionTuple ignoredVersion;
+
+      AvailabilityInference::updateBeforePlatformForFallback(
+          Attr, Ctx, platformString, ignoredVersion);
+
+      diagnose(AtLoc, diag::attr_has_no_effect_on_unavailable_decl, Attr, VD,
+               platformString);
+
+      // Find the attribute that makes the declaration unavailable.
+      const Decl *attrDecl = D;
+      do {
+        if (auto unavailableAttr = attrDecl->getUnavailableAttr()) {
+          diagnose(unavailableAttr->getParsedAttr()->AtLoc,
+                   diag::availability_marked_unavailable, VD)
+              .highlight(unavailableAttr->getParsedAttr()->getRange());
+          break;
+        }
 
-          attrDecl = AvailabilityInference::parentDeclForInferredAvailability(
-              attrDecl);
-        } while (attrDecl);
+        attrDecl =
+            AvailabilityInference::parentDeclForInferredAvailability(attrDecl);
+      } while (attrDecl);
 
-        continue;
-      }
+      continue;
     }
 
     // Verify that the decl is available before the back deployment boundary.

lib/Sema/TypeCheckAvailability.cpp

@@ -349,8 +349,7 @@ static bool computeContainedByDeploymentTarget(AvailabilityScope *scope,
 static bool isInsideCompatibleUnavailableDeclaration(
     const Decl *D, AvailabilityContext availabilityContext,
     const SemanticAvailableAttr &attr) {
-  auto contextDomain = availabilityContext.getUnavailableDomain();
-  if (!contextDomain)
+  if (!availabilityContext.isUnavailable())
     return false;
 
   if (!attr.isUnconditionallyUnavailable())
@@ -364,7 +363,7 @@ static bool isInsideCompatibleUnavailableDeclaration(
       return false;
   }
 
-  return contextDomain->contains(declDomain);
+  return availabilityContext.containsUnavailableDomain(declDomain);
 }
 
 std::optional<SemanticAvailableAttr>

unittests/AST/AvailabilityContextTests.cpp

@@ -75,14 +75,20 @@ TEST_F(AvailabilityContextTest, UnavailableDomains) {
 
   auto macOS10_9 = AvailabilityContext::forDeploymentTarget(ctx);
   EXPECT_FALSE(macOS10_9.isUnavailable());
+  EXPECT_FALSE(macOS10_9.containsUnavailableDomain(domains.macOS));
+  EXPECT_FALSE(macOS10_9.containsUnavailableDomain(domains.macOSAppExt));
+  EXPECT_FALSE(macOS10_9.containsUnavailableDomain(domains.universal));
 
   // Constrain the deployment target context by adding unavailability on macOS.
   // The resulting context should be a new context that is less available than
   // the deployment target context (a.k.a. "contained by").
   auto unavailableOnMacOS = macOS10_9;
   unavailableOnMacOS.constrainWithUnavailableDomain(domains.macOS, ctx);
   EXPECT_TRUE(unavailableOnMacOS.isUnavailable());
-  // FIXME: [availability] query unavailable domains
+  EXPECT_TRUE(unavailableOnMacOS.containsUnavailableDomain(domains.macOS));
+  EXPECT_TRUE(
+      unavailableOnMacOS.containsUnavailableDomain(domains.macOSAppExt));
+  EXPECT_FALSE(unavailableOnMacOS.containsUnavailableDomain(domains.universal));
   EXPECT_NE(unavailableOnMacOS, macOS10_9);
   EXPECT_TRUE(unavailableOnMacOS.isContainedIn(macOS10_9));
   EXPECT_FALSE(macOS10_9.isContainedIn(unavailableOnMacOS));
@@ -106,7 +112,11 @@ TEST_F(AvailabilityContextTest, UnavailableDomains) {
   auto unavailableUniversally = unavailableOnMacOS;
   unavailableUniversally.constrainWithUnavailableDomain(domains.universal, ctx);
   EXPECT_TRUE(unavailableUniversally.isUnavailable());
-  // FIXME: [availability] query unavailable domains
+  EXPECT_TRUE(unavailableUniversally.containsUnavailableDomain(domains.macOS));
+  EXPECT_TRUE(
+      unavailableUniversally.containsUnavailableDomain(domains.macOSAppExt));
+  EXPECT_TRUE(
+      unavailableUniversally.containsUnavailableDomain(domains.universal));
   EXPECT_NE(unavailableUniversally, unavailableOnMacOS);
   EXPECT_TRUE(unavailableUniversally.isContainedIn(unavailableOnMacOS));
   EXPECT_TRUE(unavailableUniversally.isContainedIn(macOS10_9));