AST: Remove AvailableAttr::isActivePlatform().

Author: tshortli

include/swift/AST/Attr.h

@@ -827,9 +827,6 @@ class AvailableAttr : public DeclAttribute {
     return swift::prettyPlatformString(getPlatform());
   }
 
-  /// Returns true if this attribute is active given the current platform.
-  bool isActivePlatform(const ASTContext &ctx) const;
-
   /// Create an AvailableAttr that indicates specific availability
   /// for all platforms.
   static AvailableAttr *

lib/AST/Attr.cpp

@@ -2148,10 +2148,6 @@ AvailableAttr::createPlatformAgnostic(ASTContext &C,
       /*SPI=*/false);
 }
 
-bool AvailableAttr::isActivePlatform(const ASTContext &ctx) const {
-  return isPlatformActive(getPlatform(), ctx.LangOpts);
-}
-
 bool BackDeployedAttr::isActivePlatform(const ASTContext &ctx,
                                         bool forTargetVariant) const {
   return isPlatformActive(Platform, ctx.LangOpts, forTargetVariant);

lib/AST/Availability.cpp

@@ -829,7 +829,7 @@ bool AvailabilityInference::isAvailableAsSPI(const Decl *D) {
 AvailabilityRange
 SemanticAvailableAttr::getIntroducedRange(ASTContext &Ctx) const {
   auto *attr = getParsedAttr();
-  assert(attr->isActivePlatform(Ctx));
+  assert(domain.isActive(Ctx));
 
   llvm::VersionTuple IntroducedVersion = attr->Introduced.value();
   StringRef Platform = attr->prettyPlatformString();

lib/Sema/TypeCheckAvailability.cpp

@@ -317,25 +317,17 @@ ExportContext::getExportabilityReason() const {
   return std::nullopt;
 }
 
-/// Returns the first availability attribute on the declaration that is active
-/// on the target platform.
-static const AvailableAttr *getActiveAvailableAttribute(const Decl *D,
-                                                        ASTContext &AC) {
+/// Returns true if there is any availability attribute on the declaration
+/// that is active.
+static bool hasActiveAvailableAttribute(const Decl *D, ASTContext &ctx) {
   D = abstractSyntaxDeclForAvailableAttribute(D);
 
-  for (auto Attr : D->getAttrs())
-    if (auto AvAttr = dyn_cast<AvailableAttr>(Attr)) {
-      if (!AvAttr->isInvalid() && AvAttr->isActivePlatform(AC)) {
-        return AvAttr;
-      }
-    }
-  return nullptr;
-}
+  for (auto Attr : D->getSemanticAvailableAttrs()) {
+    if (Attr.isActive(ctx))
+      return true;
+  }
 
-/// Returns true if there is any availability attribute on the declaration
-/// that is active on the target platform.
-static bool hasActiveAvailableAttribute(const Decl *D, ASTContext &AC) {
-  return getActiveAvailableAttribute(D, AC);
+  return false;
 }
 
 static bool computeContainedByDeploymentTarget(AvailabilityScope *scope,
@@ -1979,7 +1971,7 @@ fixAvailabilityForDecl(SourceRange ReferenceRange, const Decl *D,
   if (TypeChecker::diagnosticIfDeclCannotBePotentiallyUnavailable(D).has_value())
     return;
 
-  if (getActiveAvailableAttribute(D, Context)) {
+  if (hasActiveAvailableAttribute(D, Context)) {
     // For QoI, in future should emit a fixit to update the existing attribute.
     return;
   }