AST: Refactor AvailabilityContext::PlatformInfo operations.

Author: tshortli

include/swift/AST/AvailabilityContext.h

@@ -75,10 +75,10 @@ class AvailabilityContext {
   void constrainWithPlatformRange(const AvailabilityRange &platformRange,
                                   ASTContext &ctx);
 
-  /// Constrain the platform availability range with both the availability
-  /// attributes of `decl` and with `platformRange`.
+  /// Constrain with the availability attributes of `decl`, intersecting the
+  /// platform range of `decl` with `platformRange`.
   void
-  constrainWithDeclAndPlatformRange(Decl *decl,
+  constrainWithDeclAndPlatformRange(const Decl *decl,
                                     const AvailabilityRange &platformRange);
 
   /// Returns true if `other` is as available or is more available.

include/swift/AST/AvailabilityContextStorage.h

@@ -42,6 +42,10 @@ struct AvailabilityContext::PlatformInfo {
 
   /// Sets `Range` to `other` if `other` is more restrictive. Returns true if
   /// any property changed as a result of adding this constraint.
+  /// Updates each field to reflect the availability of `decl`, if that
+  /// availability is more restrictive. Return true if any field was updated.
+  bool constrainWith(const Decl *decl);
+
   bool constrainRange(const AvailabilityRange &other) {
     if (!other.isContainedIn(Range))
       return false;
@@ -50,19 +54,9 @@ struct AvailabilityContext::PlatformInfo {
     return true;
   }
 
-  /// Sets `Range` to the platform introduction range of `decl` if that range
-  /// is more restrictive. Returns true if
-  /// any property changed as a result of adding this constraint.
-  bool constrainRange(const Decl *decl);
-
-  /// Updates `UnavailablePlatform` and `IsUnavailable` to reflect the status
-  /// of `decl` if its platform unavailability is more restrictive. Returns
-  /// true if any property changed as a result of adding this constraint.
-  bool constrainUnavailability(const Decl *decl);
+  bool constrainUnavailability(std::optional<PlatformKind> unavailablePlatform);
 
-  /// If `decl` is deprecated, sets `IsDeprecated` to true. Returns true if
-  /// any property changed as a result of adding this constraint.
-  bool constrainDeprecated(const Decl *decl);
+  bool constrainDeprecated(bool deprecated);
 
   /// Returns true if `other` is as available or is more available.
   bool isContainedIn(const PlatformInfo &other) const;

lib/AST/AvailabilityContext.cpp

@@ -18,37 +18,44 @@
 
 using namespace swift;
 
-bool AvailabilityContext::PlatformInfo::constrainRange(const Decl *decl) {
+bool AvailabilityContext::PlatformInfo::constrainWith(const Decl *decl) {
+  bool isConstrained = false;
+  auto &ctx = decl->getASTContext();
+
   if (auto range = AvailabilityInference::annotatedAvailableRange(decl))
-    return constrainRange(*range);
+    isConstrained |= constrainRange(*range);
+
+  if (auto *attr = decl->getAttrs().getUnavailable(ctx))
+    isConstrained |= constrainUnavailability(attr->Platform);
 
-  return false;
+  if (!IsDeprecated)
+    isConstrained |= constrainDeprecated(decl->getAttrs().isDeprecated(ctx));
+
+  return isConstrained;
 }
 
 bool AvailabilityContext::PlatformInfo::constrainUnavailability(
-    const Decl *decl) {
-  auto &ctx = decl->getASTContext();
-  auto *attr = decl->getAttrs().getUnavailable(ctx);
-  if (!attr)
+    std::optional<PlatformKind> unavailablePlatform) {
+  if (!unavailablePlatform)
     return false;
 
   // Check whether the decl's unavailability reason is the same.
-  if (IsUnavailable && UnavailablePlatform == attr->Platform)
+  if (IsUnavailable && UnavailablePlatform == *unavailablePlatform)
     return false;
 
   // Check whether the decl's unavailability reason is more specific.
-  if (attr->Platform != PlatformKind::none &&
-      inheritsAvailabilityFromPlatform(attr->Platform, UnavailablePlatform))
+  if (*unavailablePlatform != PlatformKind::none &&
+      inheritsAvailabilityFromPlatform(*unavailablePlatform,
+                                       UnavailablePlatform))
     return false;
 
   IsUnavailable = true;
-  UnavailablePlatform = attr->Platform;
+  UnavailablePlatform = *unavailablePlatform;
   return true;
 }
 
-bool AvailabilityContext::PlatformInfo::constrainDeprecated(const Decl *decl) {
-  auto &ctx = decl->getASTContext();
-  if (IsDeprecated || !decl->getAttrs().isDeprecated(ctx))
+bool AvailabilityContext::PlatformInfo::constrainDeprecated(bool deprecated) {
+  if (IsDeprecated || !deprecated)
     return false;
 
   IsDeprecated = true;
@@ -126,13 +133,11 @@ void AvailabilityContext::constrainWithPlatformRange(
 }
 
 void AvailabilityContext::constrainWithDeclAndPlatformRange(
-    Decl *decl, const AvailabilityRange &platformRange) {
+    const Decl *decl, const AvailabilityRange &platformRange) {
   PlatformInfo platformAvailability{Info->Platform};
   bool isConstrained = false;
-  isConstrained |= platformAvailability.constrainRange(decl);
+  isConstrained |= platformAvailability.constrainWith(decl);
   isConstrained |= platformAvailability.constrainRange(platformRange);
-  isConstrained |= platformAvailability.constrainUnavailability(decl);
-  isConstrained |= platformAvailability.constrainDeprecated(decl);
 
   if (!isConstrained)
     return;