Merge pull request #79777 from tshortli/potential-unavailability-diagnostics

AST/Sema: Decouple potential unavailability diagnostics from platform version

Author: tshortli

include/swift/AST/ASTBridging.h

@@ -514,7 +514,7 @@ enum ENUM_EXTENSIBILITY_ATTR(open) BridgedDiagID : uint32_t {
 };
 
 class BridgedDiagnosticArgument {
-  int64_t storage[3];
+  int64_t storage[4];
 
 public:
   BRIDGED_INLINE BridgedDiagnosticArgument(const swift::DiagnosticArgument &arg);

include/swift/AST/AvailabilityConstraint.h

@@ -132,14 +132,10 @@ class AvailabilityConstraint {
   /// Returns the domain that the constraint applies to.
   AvailabilityDomain getDomain() const { return getAttr().getDomain(); }
 
-  /// Returns the platform that this constraint applies to, or
-  /// `PlatformKind::none` if it is not platform specific.
-  PlatformKind getPlatform() const;
-
   /// Returns the required range for `IntroducedInNewerVersion` requirements, or
   /// `std::nullopt` otherwise.
   std::optional<AvailabilityRange>
-  getRequiredNewerAvailabilityRange(const ASTContext &ctx) const;
+  getPotentiallyUnavailableRange(const ASTContext &ctx) const;
 
   /// Some availability constraints are active for type-checking but cannot
   /// be translated directly into an `if #available(...)` runtime query.

include/swift/AST/AvailabilityRange.h

@@ -208,6 +208,8 @@ class AvailabilityRange {
   VersionRange Range;
 
 public:
+  explicit AvailabilityRange(llvm::VersionTuple LowerEndpoint)
+      : Range(VersionRange::allGTE(LowerEndpoint)) {}
   explicit AvailabilityRange(VersionRange Range) : Range(Range) {}
 
   /// Creates a context that imposes the constraints of the ASTContext's

include/swift/AST/DiagnosticEngine.h

@@ -146,6 +146,7 @@ namespace swift {
     DescriptiveStmtKind,
     DeclAttribute,
     AvailabilityDomain,
+    AvailabilityRange,
     VersionTuple,
     LayoutConstraint,
     ActorIsolation,
@@ -184,6 +185,7 @@ namespace swift {
       StmtKind DescriptiveStmtKindVal;
       const DeclAttribute *DeclAttributeVal;
       AvailabilityDomain AvailabilityDomainVal;
+      AvailabilityRange AvailabilityRangeVal;
       llvm::VersionTuple VersionVal;
       LayoutConstraint LayoutConstraintVal;
       ActorIsolation ActorIsolationVal;
@@ -288,6 +290,10 @@ namespace swift {
         : Kind(DiagnosticArgumentKind::AvailabilityDomain),
           AvailabilityDomainVal(domain) {}
 
+    DiagnosticArgument(const AvailabilityRange &range)
+        : Kind(DiagnosticArgumentKind::AvailabilityRange),
+          AvailabilityRangeVal(range) {}
+
     DiagnosticArgument(llvm::VersionTuple version)
       : Kind(DiagnosticArgumentKind::VersionTuple),
         VersionVal(version) { }
@@ -418,6 +424,11 @@ namespace swift {
       return AvailabilityDomainVal;
     }
 
+    const AvailabilityRange getAsAvailabilityRange() const {
+      assert(Kind == DiagnosticArgumentKind::AvailabilityRange);
+      return AvailabilityRangeVal;
+    }
+
     llvm::VersionTuple getAsVersionTuple() const {
       assert(Kind == DiagnosticArgumentKind::VersionTuple);
       return VersionVal;

include/swift/AST/DiagnosticsIDE.def

@@ -30,14 +30,14 @@ WARNING(ide_availability_softdeprecated, Deprecation,
         "%0 will be deprecated"
         " in %select{a future version|%select{a future version of %2|%2 %4}3}1"
         "%select{|: %5}5",
-        (const ValueDecl *, bool, AvailabilityDomain, bool, llvm::VersionTuple,
+        (const ValueDecl *, bool, AvailabilityDomain, bool, AvailabilityRange,
          StringRef))
 
 WARNING(ide_availability_softdeprecated_rename, Deprecation,
         "%0 will be deprecated"
         " in %select{a future version|%select{a future version of %2|%2 %4}3}1"
         ": renamed to '%5'",
-        (const ValueDecl *, bool, AvailabilityDomain, bool, llvm::VersionTuple,
+        (const ValueDecl *, bool, AvailabilityDomain, bool, AvailabilityRange,
          StringRef))
 
 WARNING(ide_recursive_accessor_reference,none,

include/swift/AST/DiagnosticsIRGen.def

@@ -75,7 +75,7 @@ ERROR(attr_objc_implementation_resilient_property_deployment_target, none,
       "'@implementation' on %0 %1 does not support stored properties whose "
       "size can change due to library evolution; raise the minimum deployment "
       "target to %0 %2 or store this value in an object or 'any' type",
-      (AvailabilityDomain, const llvm::VersionTuple, const llvm::VersionTuple))
+      (AvailabilityDomain, const AvailabilityRange, const AvailabilityRange))
 
 ERROR(unable_to_load_pass_plugin,none,
       "unable to load plugin '%0': '%1'", (StringRef, StringRef))

include/swift/AST/DiagnosticsSema.def

@@ -1841,7 +1841,7 @@ ERROR(attr_objc_implementation_no_conformance,none,
 ERROR(attr_objc_implementation_raise_minimum_deployment_target,none,
       "'@implementation' of an Objective-C class requires a minimum deployment "
       "target of at least %0 %1",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 ERROR(attr_implementation_requires_language,none,
       "'@implementation' used without specifying the language being "
       "implemented",
@@ -3996,7 +3996,7 @@ ERROR(attr_not_on_decl_with_invalid_access_level,none,
 ERROR(attr_has_no_effect_decl_not_available_before,none,
       "'%0' has no effect because %1 is not "
       "available before %2 %3",
-      (DeclAttribute, const ValueDecl *, AvailabilityDomain, llvm::VersionTuple))
+      (DeclAttribute, const ValueDecl *, AvailabilityDomain, AvailabilityRange))
 
 ERROR(attr_has_no_effect_on_unavailable_decl,none,
       "'%0' has no effect because %1 is unavailable on %2",
@@ -6008,7 +6008,7 @@ ERROR(isolated_deinit_on_value_type,none,
       ())
 ERROR(isolated_deinit_unavailable,none,
       "isolated deinit is only available in %0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 //------------------------------------------------------------------------------
 // MARK: String Processing
@@ -6023,7 +6023,7 @@ ERROR(regex_capture_types_failed_to_decode,none,
 
 ERROR(regex_feature_unavailable, none,
       "%0 is only available in %1 %2 or newer",
-      (StringRef, AvailabilityDomain, llvm::VersionTuple))
+      (StringRef, AvailabilityDomain, AvailabilityRange))
 
 ERROR(must_import_regex_builder_module,none,
       "regex builder requires the 'RegexBuilder' module be imported'", ())
@@ -6373,7 +6373,7 @@ ERROR(objc_in_generic_extension,none,
       "cannot contain '@objc' members", (bool))
 ERROR(objc_in_resilient_extension,none,
       "'@objc' %0 in extension of subclass of %1 requires %2 %3",
-      (DescriptiveDeclKind, Identifier, AvailabilityDomain, llvm::VersionTuple))
+      (DescriptiveDeclKind, Identifier, AvailabilityDomain, AvailabilityRange))
 ERROR(objc_operator, none,
       "operator methods cannot be declared @objc", ())
 ERROR(objc_operator_proto, none,
@@ -6384,7 +6384,7 @@ ERROR(objc_for_generic_class,none,
       "because they are not directly visible from Objective-C", ())
 ERROR(objc_for_resilient_class,none,
       "explicit '@objc' on subclass of %0 requires %1 %2",
-      (Identifier, AvailabilityDomain, llvm::VersionTuple))
+      (Identifier, AvailabilityDomain, AvailabilityRange))
 ERROR(objc_getter_for_nonobjc_property,none,
       "'@objc' getter for non-'@objc' property", ())
 ERROR(objc_getter_for_nonobjc_subscript,none,
@@ -6784,25 +6784,25 @@ NOTE(availability_marked_unavailable, none,
 
 NOTE(availability_introduced_in_version, none,
      "%0 was introduced in %1 %2",
-     (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple))
+     (const ValueDecl *, AvailabilityDomain, AvailabilityRange))
 
 NOTE(availability_obsoleted, none,
      "%0 was obsoleted in %1 %2",
-     (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple))
+     (const ValueDecl *, AvailabilityDomain, AvailabilityRange))
 
 GROUPED_WARNING(availability_deprecated, DeprecatedDeclaration, Deprecation,
                 "%0 %select{is|%select{is|was}3}1 "
                 "deprecated%select{| in %2%select{| %4}3}1%select{|: %5}5",
                 (const ValueDecl *, bool, AvailabilityDomain, bool,
-                 llvm::VersionTuple, StringRef))
+                 AvailabilityRange, StringRef))
 
 GROUPED_WARNING(
       availability_deprecated_rename, DeprecatedDeclaration, Deprecation,
       "%0 %select{is|%select{is|was}3}1 "
       "deprecated%select{| in %2%select{| %4}3}1: "
       "%select{renamed to|replaced by}5%" REPLACEMENT_DECL_KIND_SELECT "6 "
       "'%7'",
-      (const ValueDecl *, bool, AvailabilityDomain, bool, llvm::VersionTuple,
+      (const ValueDecl *, bool, AvailabilityDomain, bool, AvailabilityRange,
        bool, unsigned, StringRef))
 #undef REPLACEMENT_DECL_KIND_SELECT
 
@@ -6815,63 +6815,63 @@ ERROR(availability_decl_more_than_enclosing, none,
 
 NOTE(availability_implicit_decl_here, none,
      "%0 implicitly declared here with availability of %1 %2 or newer",
-     (DescriptiveDeclKind, AvailabilityDomain, llvm::VersionTuple))
+     (DescriptiveDeclKind, AvailabilityDomain, AvailabilityRange))
 
 NOTE(availability_decl_more_than_enclosing_here, none,
      "enclosing scope requires availability of %0 %1 or newer",
-     (AvailabilityDomain, llvm::VersionTuple))
+     (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_decl_only_version_newer, none,
       "%0 is only available in %1 %2 or newer",
-      (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple))
+      (const ValueDecl *, AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_decl_only_version_newer_for_clients, none,
       "%0 is only available in %1 %2 or newer; clients of %3 may have a lower"
       " deployment target",
-      (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple, ModuleDecl *))
+      (const ValueDecl *, AvailabilityDomain, AvailabilityRange, ModuleDecl *))
 
 WARNING(availability_decl_only_version_newer_for_clients_warn, none,
         "%0 is only available in %1 %2 or newer; clients of %3 may have a lower"
         " deployment target",
-        (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple,
+        (const ValueDecl *, AvailabilityDomain, AvailabilityRange,
          ModuleDecl *))
 
 ERROR(availability_opaque_types_only_version_newer, none,
       "'some' return types are only available in %0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_concurrency_only_version_newer, none,
       "concurrency is only available in %0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_parameterized_protocol_only_version_newer, none,
       "runtime support for parameterized protocol types is only available in "
       "%0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_isolated_any_only_version_newer, none,
       "runtime support for @isolated(any) function types is only available in "
       "%0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_copyable_generics_casting_only_version_newer, none,
       "runtime support for casting types with noncopyable generic arguments "
       "is only available in %0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_escapable_generics_casting_only_version_newer, none,
       "runtime support for casting types with nonescapable generic arguments "
       "is only available in %0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_typed_throws_only_version_newer, none,
       "runtime support for typed throws function types is only available in "
       "%0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_variadic_type_only_version_newer, none,
       "parameter packs in generic types are only available in %0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 
 NOTE(availability_guard_with_version_check, none,
      "add 'if #available' version check", ())
@@ -6884,7 +6884,7 @@ FIXIT(insert_available_attr,
 
 ERROR(availability_inout_accessor_only_version_newer, none,
       "cannot pass as inout because %0 is only available in %1 %2 or newer",
-      (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple))
+      (const ValueDecl *, AvailabilityDomain, AvailabilityRange))
 
 ERROR(availability_query_required_for_platform, none,
       "condition required for target platform '%0'", (StringRef))
@@ -6931,7 +6931,7 @@ WARNING(availability_enum_element_no_potential_warn,
 ERROR(availability_protocol_requires_version,
       none, "protocol %0 requires %1 to be available in %2 %3 and newer",
       (const ProtocolDecl *, const ValueDecl *, AvailabilityDomain,
-       llvm::VersionTuple))
+       AvailabilityRange))
 
 NOTE(availability_protocol_requirement_here, none,
      "protocol requirement here", ())
@@ -6972,22 +6972,22 @@ NOTE(conformance_availability_marked_unavailable, none,
 
 NOTE(conformance_availability_introduced_in_version, none,
      "conformance of %0 to %1 was introduced in %2 %3",
-     (Type, Type, AvailabilityDomain, llvm::VersionTuple))
+     (Type, Type, AvailabilityDomain, AvailabilityRange))
 
 NOTE(conformance_availability_obsoleted, none,
      "conformance of %0 to %1 was obsoleted in %2 %3",
-     (Type, Type, AvailabilityDomain, llvm::VersionTuple))
+     (Type, Type, AvailabilityDomain, AvailabilityRange))
 
 GROUPED_WARNING(conformance_availability_deprecated,
                 DeprecatedDeclaration, Deprecation,
                 "conformance of %0 to %1 %select{is|%select{is|was}4}2 "
                 "deprecated%select{| in %3%select{| %5}4}2%select{|: %6}6",
-                (Type, Type, bool, AvailabilityDomain, bool, llvm::VersionTuple,
+                (Type, Type, bool, AvailabilityDomain, bool, AvailabilityRange,
                  StringRef))
 
 ERROR(conformance_availability_only_version_newer, none,
       "conformance of %0 to %1 is only available in %2 %3 or newer",
-      (Type, Type, AvailabilityDomain, llvm::VersionTuple))
+      (Type, Type, AvailabilityDomain, AvailabilityRange))
 
 //------------------------------------------------------------------------------
 // MARK: if #available(...)
@@ -8257,7 +8257,7 @@ ERROR(value_generics_missing_feature,none,
       "value generics require '-enable-experimental-feature ValueGenerics'", ())
 ERROR(availability_value_generic_type_only_version_newer, none,
       "values in generic types are only available in %0 %1 or newer",
-      (AvailabilityDomain, llvm::VersionTuple))
+      (AvailabilityDomain, AvailabilityRange))
 ERROR(invalid_value_for_type_same_type,none,
       "cannot constrain type parameter %0 to be integer %1", (Type, Type))
 

lib/AST/Availability.cpp

@@ -58,17 +58,15 @@ void VersionRange::Profile(llvm::FoldingSetNodeID &id) const {
 
 AvailabilityRange
 AvailabilityRange::forDeploymentTarget(const ASTContext &Ctx) {
-  return AvailabilityRange(
-      VersionRange::allGTE(Ctx.LangOpts.getMinPlatformVersion()));
+  return AvailabilityRange(Ctx.LangOpts.getMinPlatformVersion());
 }
 
 AvailabilityRange AvailabilityRange::forInliningTarget(const ASTContext &Ctx) {
-  return AvailabilityRange(
-      VersionRange::allGTE(Ctx.LangOpts.MinimumInliningTargetVersion));
+  return AvailabilityRange(Ctx.LangOpts.MinimumInliningTargetVersion);
 }
 
 AvailabilityRange AvailabilityRange::forRuntimeTarget(const ASTContext &Ctx) {
-  return AvailabilityRange(VersionRange::allGTE(Ctx.LangOpts.RuntimeVersion));
+  return AvailabilityRange(Ctx.LangOpts.RuntimeVersion);
 }
 
 namespace {
@@ -853,7 +851,7 @@ SemanticAvailableAttr::getIntroducedRange(const ASTContext &Ctx) const {
           *this, Ctx, unusedDomain, remappedVersion))
     introducedVersion = remappedVersion;
 
-  return AvailabilityRange{VersionRange::allGTE(introducedVersion)};
+  return AvailabilityRange{introducedVersion};
 }
 
 std::optional<llvm::VersionTuple> SemanticAvailableAttr::getDeprecated() const {
@@ -877,7 +875,7 @@ SemanticAvailableAttr::getDeprecatedRange(const ASTContext &Ctx) const {
           *this, Ctx, unusedDomain, remappedVersion))
     deprecatedVersion = remappedVersion;
 
-  return AvailabilityRange{VersionRange::allGTE(deprecatedVersion)};
+  return AvailabilityRange{deprecatedVersion};
 }
 
 std::optional<llvm::VersionTuple> SemanticAvailableAttr::getObsoleted() const {
@@ -901,7 +899,7 @@ SemanticAvailableAttr::getObsoletedRange(const ASTContext &Ctx) const {
           *this, Ctx, unusedDomain, remappedVersion))
     obsoletedVersion = remappedVersion;
 
-  return AvailabilityRange{VersionRange::allGTE(obsoletedVersion)};
+  return AvailabilityRange{obsoletedVersion};
 }
 
 namespace {
@@ -931,8 +929,7 @@ AvailabilityRange ASTContext::getSwiftFutureAvailability() const {
   auto target = LangOpts.Target;
 
   auto getFutureAvailabilityRange = []() -> AvailabilityRange {
-    return AvailabilityRange(
-        VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
+    return AvailabilityRange(llvm::VersionTuple(99, 99, 0));
   };
 
   if (target.isMacOSX()) {

lib/AST/AvailabilityConstraint.cpp

@@ -18,12 +18,8 @@
 
 using namespace swift;
 
-PlatformKind AvailabilityConstraint::getPlatform() const {
-  return getAttr().getPlatform();
-}
-
 std::optional<AvailabilityRange>
-AvailabilityConstraint::getRequiredNewerAvailabilityRange(
+AvailabilityConstraint::getPotentiallyUnavailableRange(
     const ASTContext &ctx) const {
   switch (getReason()) {
   case Reason::UnconditionallyUnavailable:

lib/AST/AvailabilityDomain.cpp

@@ -126,7 +126,7 @@ getDeploymentVersion(const AvailabilityDomain &domain, const ASTContext &ctx) {
 std::optional<AvailabilityRange>
 AvailabilityDomain::getDeploymentRange(const ASTContext &ctx) const {
   if (auto version = getDeploymentVersion(*this, ctx))
-    return AvailabilityRange{VersionRange::allGTE(*version)};
+    return AvailabilityRange{*version};
   return std::nullopt;
 }