Merge pull request swiftlang#79711 from tshortli/availability-diagnostics

AST/Sema: Adopt `AvailabilityDomain` arguments in diagnostics

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/AvailabilityInference.h

@@ -24,6 +24,7 @@
 
 namespace swift {
 class ASTContext;
+class AvailabilityDomain;
 class BackDeployedAttr;
 class Decl;
 class SemanticAvailableAttr;
@@ -62,35 +63,35 @@ class AvailabilityInference {
   /// For the attribute's introduction version, update the platform and version
   /// values to the re-mapped platform's, if using a fallback platform.
   /// Returns `true` if a remap occured.
-  static bool updateIntroducedPlatformForFallback(
-      const SemanticAvailableAttr &attr, const ASTContext &Ctx,
-      llvm::StringRef &Platform, llvm::VersionTuple &PlatformVer);
+  static bool updateIntroducedAvailabilityDomainForFallback(
+      const SemanticAvailableAttr &attr, const ASTContext &ctx,
+      AvailabilityDomain &domain, llvm::VersionTuple &platformVer);
 
   /// For the attribute's deprecation version, update the platform and version
   /// values to the re-mapped platform's, if using a fallback platform.
   /// Returns `true` if a remap occured.
-  static bool updateDeprecatedPlatformForFallback(
-      const SemanticAvailableAttr &attr, const ASTContext &Ctx,
-      llvm::StringRef &Platform, llvm::VersionTuple &PlatformVer);
+  static bool updateDeprecatedAvailabilityDomainForFallback(
+      const SemanticAvailableAttr &attr, const ASTContext &ctx,
+      AvailabilityDomain &domain, llvm::VersionTuple &platformVer);
 
   /// For the attribute's obsoletion version, update the platform and version
   /// values to the re-mapped platform's, if using a fallback platform.
   /// Returns `true` if a remap occured.
-  static bool updateObsoletedPlatformForFallback(
-      const SemanticAvailableAttr &attr, const ASTContext &Ctx,
-      llvm::StringRef &Platform, llvm::VersionTuple &PlatformVer);
+  static bool updateObsoletedAvailabilityDomainForFallback(
+      const SemanticAvailableAttr &attr, const ASTContext &ctx,
+      AvailabilityDomain &domain, llvm::VersionTuple &platformVer);
 
-  static void updatePlatformStringForFallback(const SemanticAvailableAttr &attr,
-                                              const ASTContext &Ctx,
-                                              llvm::StringRef &Platform);
+  static void
+  updateAvailabilityDomainForFallback(const SemanticAvailableAttr &attr,
+                                      const ASTContext &ctx,
+                                      AvailabilityDomain &domain);
 
   /// For the attribute's before version, update the platform and version
   /// values to the re-mapped platform's, if using a fallback platform.
   /// Returns `true` if a remap occured.
-  static bool updateBeforePlatformForFallback(const BackDeployedAttr *attr,
-                                              const ASTContext &Ctx,
-                                              llvm::StringRef &Platform,
-                                              llvm::VersionTuple &PlatformVer);
+  static bool updateBeforeAvailabilityDomainForFallback(
+      const BackDeployedAttr *attr, const ASTContext &ctx,
+      AvailabilityDomain &domain, llvm::VersionTuple &platformVer);
 };
 
 // FIXME: This should become a utility on Decl.

include/swift/AST/DiagnosticEngine.h

@@ -19,6 +19,7 @@
 #define SWIFT_BASIC_DIAGNOSTICENGINE_H
 
 #include "swift/AST/ActorIsolation.h"
+#include "swift/AST/AvailabilityDomain.h"
 #include "swift/AST/DeclNameLoc.h"
 #include "swift/AST/DiagnosticConsumer.h"
 #include "swift/AST/TypeLoc.h"
@@ -143,6 +144,7 @@ namespace swift {
     DescriptiveDeclKind,
     DescriptiveStmtKind,
     DeclAttribute,
+    AvailabilityDomain,
     VersionTuple,
     LayoutConstraint,
     ActorIsolation,
@@ -179,6 +181,7 @@ namespace swift {
       DescriptiveDeclKind DescriptiveDeclKindVal;
       StmtKind DescriptiveStmtKindVal;
       const DeclAttribute *DeclAttributeVal;
+      AvailabilityDomain AvailabilityDomainVal;
       llvm::VersionTuple VersionVal;
       LayoutConstraint LayoutConstraintVal;
       ActorIsolation ActorIsolationVal;
@@ -278,6 +281,10 @@ namespace swift {
         : Kind(DiagnosticArgumentKind::DeclAttribute),
           DeclAttributeVal(attr) {}
 
+    DiagnosticArgument(const AvailabilityDomain domain)
+        : Kind(DiagnosticArgumentKind::AvailabilityDomain),
+          AvailabilityDomainVal(domain) {}
+
     DiagnosticArgument(llvm::VersionTuple version)
       : Kind(DiagnosticArgumentKind::VersionTuple),
         VersionVal(version) { }
@@ -400,6 +407,11 @@ namespace swift {
       return DeclAttributeVal;
     }
 
+    const AvailabilityDomain getAsAvailabilityDomain() const {
+      assert(Kind == DiagnosticArgumentKind::AvailabilityDomain);
+      return AvailabilityDomainVal;
+    }
+
     llvm::VersionTuple getAsVersionTuple() const {
       assert(Kind == DiagnosticArgumentKind::VersionTuple);
       return VersionVal;

include/swift/AST/DiagnosticsIDE.def

@@ -30,14 +30,15 @@ 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, StringRef, bool, llvm::VersionTuple,
+        (const ValueDecl *, bool, AvailabilityDomain, bool, llvm::VersionTuple,
          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, StringRef, bool, llvm::VersionTuple, StringRef))
+        (const ValueDecl *, bool, AvailabilityDomain, bool, llvm::VersionTuple,
+         StringRef))
 
 WARNING(ide_recursive_accessor_reference,none,
         "attempting to %select{access|modify}1 %0 within its own "

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))