AST/Sema: Adopt AvailabilityDomain arguments in even more diagnostics.

Update potential unavailability diagnostics to take `AvailabilityDomain`
instead of a platform string.

Author: tshortli

include/swift/AST/ASTContext.h

@@ -72,6 +72,7 @@ namespace swift {
   class AbstractFunctionDecl;
   class ASTContext;
   enum class Associativity : unsigned char;
+  class AvailabilityDomain;
   class AvailabilityMacroMap;
   class AvailabilityRange;
   class BoundGenericType;
@@ -1596,9 +1597,10 @@ class ASTContext final {
 public:
   clang::DarwinSDKInfo *getDarwinSDKInfo() const;
 
-  /// Returns the string to use in diagnostics when printing the platform being
-  /// targetted.
-  StringRef getTargetPlatformStringForDiagnostics() const;
+  /// Returns the availability domain corresponding to the target triple. If
+  /// there isn't a `PlatformKind` associated with the current target triple,
+  /// then this returns the universal domain (`*`).
+  AvailabilityDomain getTargetAvailabilityDomain() const;
 };
 
 } // end namespace swift

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",
-      (StringRef, const llvm::VersionTuple, const llvm::VersionTuple))
+      (AvailabilityDomain, const llvm::VersionTuple, const llvm::VersionTuple))
 
 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",
-      (StringRef, llvm::VersionTuple))
+      (AvailabilityDomain, llvm::VersionTuple))
 ERROR(attr_implementation_requires_language,none,
       "'@implementation' used without specifying the language being "
       "implemented",
@@ -6383,7 +6383,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, StringRef, llvm::VersionTuple))
+      (DescriptiveDeclKind, Identifier, AvailabilityDomain, llvm::VersionTuple))
 ERROR(objc_operator, none,
       "operator methods cannot be declared @objc", ())
 ERROR(objc_operator_proto, none,
@@ -6394,7 +6394,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, StringRef, llvm::VersionTuple))
+      (Identifier, AvailabilityDomain, llvm::VersionTuple))
 ERROR(objc_getter_for_nonobjc_property,none,
       "'@objc' getter for non-'@objc' property", ())
 ERROR(objc_getter_for_nonobjc_subscript,none,
@@ -6825,25 +6825,26 @@ 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, StringRef, llvm::VersionTuple))
+     (DescriptiveDeclKind, AvailabilityDomain, llvm::VersionTuple))
 
 NOTE(availability_decl_more_than_enclosing_here, none,
      "enclosing scope requires availability of %0 %1 or newer",
-     (StringRef, llvm::VersionTuple))
+     (AvailabilityDomain, llvm::VersionTuple))
 
 ERROR(availability_decl_only_version_newer, none,
       "%0 is only available in %1 %2 or newer",
-      (const ValueDecl *, StringRef, llvm::VersionTuple))
+      (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple))
 
 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 *, StringRef, llvm::VersionTuple, ModuleDecl *))
+      (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple, 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 *, StringRef, llvm::VersionTuple, ModuleDecl *))
+        (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple,
+         ModuleDecl *))
 
 ERROR(availability_opaque_types_only_version_newer, none,
       "'some' return types are only available in %0 %1 or newer",
@@ -6893,7 +6894,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 *, StringRef, llvm::VersionTuple))
+      (const ValueDecl *, AvailabilityDomain, llvm::VersionTuple))
 
 ERROR(availability_query_required_for_platform, none,
       "condition required for target platform '%0'", (StringRef))
@@ -6939,7 +6940,8 @@ 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 *, StringRef, llvm::VersionTuple))
+      (const ProtocolDecl *, const ValueDecl *, AvailabilityDomain,
+       llvm::VersionTuple))
 
 NOTE(availability_protocol_requirement_here, none,
      "protocol requirement here", ())
@@ -6995,7 +6997,7 @@ GROUPED_WARNING(conformance_availability_deprecated,
 
 ERROR(conformance_availability_only_version_newer, none,
       "conformance of %0 to %1 is only available in %2 %3 or newer",
-      (Type, Type, StringRef, llvm::VersionTuple))
+      (Type, Type, AvailabilityDomain, llvm::VersionTuple))
 
 //------------------------------------------------------------------------------
 // MARK: if #available(...)

lib/AST/ASTContext.cpp

@@ -7058,6 +7058,10 @@ ValueOwnership swift::asValueOwnership(ParameterOwnership o) {
   llvm_unreachable("exhaustive switch");
 }
 
-StringRef ASTContext::getTargetPlatformStringForDiagnostics() const {
-  return prettyPlatformString(targetPlatform(LangOpts));
+AvailabilityDomain ASTContext::getTargetAvailabilityDomain() const {
+  if (auto domain = AvailabilityDomain::forTargetPlatform(*this))
+    return *domain;
+
+  // Fall back to the universal domain for triples without a platform.
+  return AvailabilityDomain::forUniversal();
 }

lib/IRGen/GenMeta.cpp

@@ -5193,7 +5193,7 @@ diagnoseUnsupportedObjCImplLayout(IRGenModule &IGM, ClassDecl *classDecl,
         diags.diagnose(
             field.getVarDecl(),
             diag::attr_objc_implementation_resilient_property_deployment_target,
-            ctx.getTargetPlatformStringForDiagnostics(),
+            ctx.getTargetAvailabilityDomain(),
             currentAvailability.getRawMinimumVersion(),
             requiredAvailability.getRawMinimumVersion());
       else

lib/Sema/TypeCheckAttr.cpp

@@ -1896,7 +1896,7 @@ visitObjCImplementationAttr(ObjCImplementationAttr *attr) {
       auto diag = diagnose(
           attr->getLocation(),
           diag::attr_objc_implementation_raise_minimum_deployment_target,
-          Ctx.getTargetPlatformStringForDiagnostics(),
+          Ctx.getTargetAvailabilityDomain(),
           Ctx.getSwift50Availability().getRawMinimumVersion());
       if (attr->isEarlyAdopter()) {
         diag.wrapIn(diag::wrap_objc_implementation_will_become_error);
@@ -2431,12 +2431,11 @@ void AttributeChecker::visitAvailableAttr(AvailableAttr *parsedAttr) {
         if (D->isImplicit())
           diagnose(enclosingDecl->getLoc(),
                    diag::availability_implicit_decl_here,
-                   D->getDescriptiveKind(),
-                   Ctx.getTargetPlatformStringForDiagnostics(),
+                   D->getDescriptiveKind(), Ctx.getTargetAvailabilityDomain(),
                    AttrRange.getRawMinimumVersion());
         diagnose(enclosingDecl->getLoc(),
                  diag::availability_decl_more_than_enclosing_here,
-                 Ctx.getTargetPlatformStringForDiagnostics(),
+                 Ctx.getTargetAvailabilityDomain(),
                  EnclosingAnnotatedRange->getRawMinimumVersion());
       }
     }

lib/Sema/TypeCheckAvailability.cpp

@@ -2163,7 +2163,9 @@ static void diagnosePotentialUnavailability(
   ASTContext &Context = ReferenceDC->getASTContext();
 
   {
-    auto Err = Diagnose(Context.getTargetPlatformStringForDiagnostics(),
+    // FIXME: [availability] Update diagnostics to take an AvailabilityDomain.
+    auto Domain = Context.getTargetAvailabilityDomain();
+    auto Err = Diagnose(Domain.getNameForDiagnostics(),
                         Availability.getRawMinimumVersion());
 
     // Direct a fixit to the error if an existing guard is nearly-correct
@@ -2231,7 +2233,7 @@ static Diagnostic getPotentialUnavailabilityDiagnostic(
     const AvailabilityRange &Availability, bool WarnBeforeDeploymentTarget,
     bool &IsError) {
   ASTContext &Context = ReferenceDC->getASTContext();
-  auto Platform = Context.getTargetPlatformStringForDiagnostics();
+  auto Domain = Context.getTargetAvailabilityDomain();
 
   if (requiresDeploymentTargetOrEarlier(Availability, Context)) {
     // The required OS version is at or before the deployment target so this
@@ -2242,12 +2244,12 @@ static Diagnostic getPotentialUnavailabilityDiagnostic(
     return Diagnostic(
         IsError ? diag::availability_decl_only_version_newer_for_clients
                 : diag::availability_decl_only_version_newer_for_clients_warn,
-        D, Platform, Availability.getRawMinimumVersion(),
+        D, Domain, Availability.getRawMinimumVersion(),
         ReferenceDC->getParentModule());
   }
 
   IsError = true;
-  return Diagnostic(diag::availability_decl_only_version_newer, D, Platform,
+  return Diagnostic(diag::availability_decl_only_version_newer, D, Domain,
                     Availability.getRawMinimumVersion());
 }
 
@@ -2294,10 +2296,9 @@ static void diagnosePotentialAccessorUnavailability(
                         : diag::availability_decl_only_version_newer;
 
   {
-    auto Err = Context.Diags.diagnose(
-        ReferenceRange.Start, diag, Accessor,
-        Context.getTargetPlatformStringForDiagnostics(),
-        Availability.getRawMinimumVersion());
+    auto Err = Context.Diags.diagnose(ReferenceRange.Start, diag, Accessor,
+                                      Context.getTargetAvailabilityDomain(),
+                                      Availability.getRawMinimumVersion());
 
     // Direct a fixit to the error if an existing guard is nearly-correct
     if (fixAvailabilityByNarrowingNearbyVersionCheck(
@@ -2343,8 +2344,7 @@ diagnosePotentialUnavailability(const RootProtocolConformance *rootConf,
     auto proto = rootConf->getProtocol()->getDeclaredInterfaceType();
     auto err = ctx.Diags.diagnose(
         loc, diag::conformance_availability_only_version_newer, type, proto,
-        ctx.getTargetPlatformStringForDiagnostics(),
-        availability.getRawMinimumVersion());
+        ctx.getTargetAvailabilityDomain(), availability.getRawMinimumVersion());
 
     auto behaviorLimit = behaviorLimitForExplicitUnavailability(rootConf, dc);
     if (behaviorLimit >= DiagnosticBehavior::Warning)

lib/Sema/TypeCheckDeclObjC.cpp

@@ -583,13 +583,14 @@ static bool checkObjCInExtensionContext(const ValueDecl *value,
                                             ResilienceExpansion::Maximal)) {
           auto stubAvailability = getObjCClassStubAvailability(ctx);
           auto *ancestor = getResilientAncestor(mod, classDecl);
-          softenIfAccessNote(value, reason.getAttr(),
-            value->diagnose(diag::objc_in_resilient_extension,
-                            value->getDescriptiveKind(),
-                            ancestor->getName(),
-                            ctx.getTargetPlatformStringForDiagnostics(),
-                            stubAvailability.getRawMinimumVersion())
-                .limitBehavior(behavior));
+          softenIfAccessNote(
+              value, reason.getAttr(),
+              value
+                  ->diagnose(diag::objc_in_resilient_extension,
+                             value->getDescriptiveKind(), ancestor->getName(),
+                             ctx.getTargetAvailabilityDomain(),
+                             stubAvailability.getRawMinimumVersion())
+                  .limitBehavior(behavior));
           reason.describe(value);
           return true;
         }
@@ -1356,7 +1357,7 @@ static std::optional<ObjCReason> shouldMarkClassAsObjC(const ClassDecl *CD) {
       auto *ancestor = getResilientAncestor(CD->getParentModule(), CD);
       swift::diagnoseAndRemoveAttr(CD, attr, diag::objc_for_resilient_class,
                                    ancestor->getName(),
-                                   ctx.getTargetPlatformStringForDiagnostics(),
+                                   ctx.getTargetAvailabilityDomain(),
                                    stubAvailability.getRawMinimumVersion())
           .limitBehavior(behavior);
       reason.describe(CD);

lib/Sema/TypeCheckProtocol.cpp

@@ -4531,7 +4531,7 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
           SourceLoc diagLoc = getLocForDiagnosingWitness(conformance, witness);
           diags.diagnose(diagLoc, diag::availability_protocol_requires_version,
                          conformance->getProtocol(), witness,
-                         ctx.getTargetPlatformStringForDiagnostics(),
+                         ctx.getTargetAvailabilityDomain(),
                          check.RequiredAvailability.getRawMinimumVersion());
           emitDeclaredHereIfNeeded(diags, diagLoc, witness);
           diags.diagnose(requirement,
@@ -5049,8 +5049,7 @@ static bool diagnoseTypeWitnessAvailability(
           ctx.Diags
               .diagnose(loc, diag::availability_protocol_requires_version,
                         conformance->getProtocol(), witness,
-                        ctx.getTargetPlatformStringForDiagnostics(),
-                        requiredVersion)
+                        ctx.getTargetAvailabilityDomain(), requiredVersion)
               .warnUntilSwiftVersion(warnBeforeVersion);
 
           emitDeclaredHereIfNeeded(ctx.Diags, loc, witness);