Merge pull request swiftlang#79554 from tshortli/canonicalize-available-attr-on-demand

AST: Canonicalize `AvailableAttr` versions on-demand

Author: tshortli

include/swift/AST/Attr.h

@@ -746,11 +746,11 @@ class AvailableAttr : public DeclAttribute {
   const StringRef Message;
   const StringRef Rename;
 
-  llvm::VersionTuple Introduced;
+  const llvm::VersionTuple Introduced;
   const SourceRange IntroducedRange;
-  llvm::VersionTuple Deprecated;
+  const llvm::VersionTuple Deprecated;
   const SourceRange DeprecatedRange;
-  llvm::VersionTuple Obsoleted;
+  const llvm::VersionTuple Obsoleted;
   const SourceRange ObsoletedRange;
 
 public:
@@ -909,12 +909,6 @@ class AvailableAttr : public DeclAttribute {
 private:
   friend class SemanticAvailableAttrRequest;
 
-  void setRawIntroduced(llvm::VersionTuple version) { Introduced = version; }
-
-  void setRawDeprecated(llvm::VersionTuple version) { Deprecated = version; }
-
-  void setRawObsoleted(llvm::VersionTuple version) { Obsoleted = version; }
-
   void setCachedDomain(AvailabilityDomain domain) {
     assert(!DomainOrIdentifier.isDomain());
     DomainOrIdentifier.setDomain(domain);
@@ -3310,10 +3304,8 @@ class SemanticAvailableAttr final {
     return attr->getCachedDomain().value();
   }
 
-  /// The version tuple written in source for the `introduced:` component.
-  std::optional<llvm::VersionTuple> getIntroduced() const {
-    return attr->getRawIntroduced();
-  }
+  /// The version tuple for the `introduced:` component.
+  std::optional<llvm::VersionTuple> getIntroduced() const;
 
   /// The source range of the `introduced:` version component.
   SourceRange getIntroducedSourceRange() const { return attr->IntroducedRange; }
@@ -3322,18 +3314,14 @@ class SemanticAvailableAttr final {
   /// was introduced.
   AvailabilityRange getIntroducedRange(const ASTContext &Ctx) const;
 
-  /// The version tuple written in source for the `deprecated:` component.
-  std::optional<llvm::VersionTuple> getDeprecated() const {
-    return attr->getRawDeprecated();
-  }
+  /// The version tuple for the `deprecated:` component.
+  std::optional<llvm::VersionTuple> getDeprecated() const;
 
   /// The source range of the `deprecated:` version component.
   SourceRange getDeprecatedSourceRange() const { return attr->DeprecatedRange; }
 
-  /// The version tuple written in source for the `obsoleted:` component.
-  std::optional<llvm::VersionTuple> getObsoleted() const {
-    return attr->getRawObsoleted();
-  }
+  /// The version tuple for the `obsoleted:` component.
+  std::optional<llvm::VersionTuple> getObsoleted() const;
 
   /// The source range of the `obsoleted:` version component.
   SourceRange getObsoletedSourceRange() const { return attr->ObsoletedRange; }

lib/AST/Availability.cpp

@@ -824,9 +824,6 @@ SemanticAvailableAttrRequest::evaluate(swift::Evaluator &evaluator,
   auto attrLoc = attr->getLocation();
   auto attrName = attr->getAttrName();
   auto domainLoc = attr->getDomainLoc();
-  auto introducedVersion = attr->getRawIntroduced();
-  auto deprecatedVersion = attr->getRawDeprecated();
-  auto obsoletedVersion = attr->getRawObsoleted();
   auto mutableAttr = const_cast<AvailableAttr *>(attr);
   auto domain = attr->getCachedDomain();
 
@@ -867,16 +864,18 @@ SemanticAvailableAttrRequest::evaluate(swift::Evaluator &evaluator,
   auto domainName = domain->getNameForAttributePrinting();
   auto semanticAttr = SemanticAvailableAttr(attr);
 
-  bool hasVersionSpec =
-      (introducedVersion || deprecatedVersion || obsoletedVersion);
+  bool hasIntroduced = attr->getRawIntroduced().has_value();
+  bool hasDeprecated = attr->getRawDeprecated().has_value();
+  auto hasObsoleted = attr->getRawObsoleted().has_value();
+  bool hasVersionSpec = (hasIntroduced || hasDeprecated || hasObsoleted);
 
   if (!domain->isVersioned() && hasVersionSpec) {
     SourceRange versionSourceRange;
-    if (introducedVersion)
+    if (hasIntroduced)
       versionSourceRange = semanticAttr.getIntroducedSourceRange();
-    else if (deprecatedVersion)
+    else if (hasDeprecated)
       versionSourceRange = semanticAttr.getDeprecatedSourceRange();
-    else if (obsoletedVersion)
+    else if (hasObsoleted)
       versionSourceRange = semanticAttr.getObsoletedSourceRange();
 
     diags
@@ -915,25 +914,15 @@ SemanticAvailableAttrRequest::evaluate(swift::Evaluator &evaluator,
     }
   }
 
-  // Canonicalize platform versions.
-  // FIXME: [availability] This should be done when remapping versions instead.
-  if (domain->isPlatform()) {
-    auto canonicalizeVersion = [&](llvm::VersionTuple version) {
-      return canonicalizePlatformVersion(domain->getPlatformKind(), version);
-    };
-    if (introducedVersion)
-      mutableAttr->setRawIntroduced(canonicalizeVersion(*introducedVersion));
-
-    if (deprecatedVersion)
-      mutableAttr->setRawDeprecated(canonicalizeVersion(*deprecatedVersion));
-
-    if (obsoletedVersion)
-      mutableAttr->setRawObsoleted(canonicalizeVersion(*obsoletedVersion));
-  }
-
   return semanticAttr;
 }
 
+std::optional<llvm::VersionTuple> SemanticAvailableAttr::getIntroduced() const {
+  if (auto version = attr->getRawIntroduced())
+    return canonicalizePlatformVersion(getPlatform(), *version);
+  return std::nullopt;
+}
+
 AvailabilityRange
 SemanticAvailableAttr::getIntroducedRange(const ASTContext &Ctx) const {
   assert(getDomain().isActive(Ctx));
@@ -942,7 +931,7 @@ SemanticAvailableAttr::getIntroducedRange(const ASTContext &Ctx) const {
   if (!attr->getRawIntroduced().has_value())
     return AvailabilityRange::alwaysAvailable();
 
-  llvm::VersionTuple IntroducedVersion = attr->getRawIntroduced().value();
+  llvm::VersionTuple IntroducedVersion = getIntroduced().value();
   StringRef Platform;
   llvm::VersionTuple RemappedIntroducedVersion;
   if (AvailabilityInference::updateIntroducedPlatformForFallback(
@@ -952,6 +941,18 @@ SemanticAvailableAttr::getIntroducedRange(const ASTContext &Ctx) const {
   return AvailabilityRange{VersionRange::allGTE(IntroducedVersion)};
 }
 
+std::optional<llvm::VersionTuple> SemanticAvailableAttr::getDeprecated() const {
+  if (auto version = attr->getRawDeprecated())
+    return canonicalizePlatformVersion(getPlatform(), *version);
+  return std::nullopt;
+}
+
+std::optional<llvm::VersionTuple> SemanticAvailableAttr::getObsoleted() const {
+  if (auto version = attr->getRawObsoleted())
+    return canonicalizePlatformVersion(getPlatform(), *version);
+  return std::nullopt;
+}
+
 namespace {
 /// Infers the availability required to access a type.
 class AvailabilityInferenceTypeWalker : public TypeWalker {