AST: Introduce ASTContext::getTargetPlatformStringForDiagnostics().

NFC.

Author: tshortli

include/swift/AST/ASTContext.h

@@ -1542,6 +1542,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;
 };
 
 } // end namespace swift

lib/AST/ASTContext.cpp

@@ -6733,3 +6733,7 @@ ValueOwnership swift::asValueOwnership(ParameterOwnership o) {
   }
   llvm_unreachable("exhaustive switch");
 }
+
+StringRef ASTContext::getTargetPlatformStringForDiagnostics() const {
+  return prettyPlatformString(targetPlatform(LangOpts));
+}

lib/IRGen/GenMeta.cpp

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

lib/Sema/TypeCheckAttr.cpp

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

lib/Sema/TypeCheckAvailability.cpp

@@ -2068,7 +2068,7 @@ void TypeChecker::diagnosePotentialUnavailability(
   {
     auto Err = Context.Diags.diagnose(
         ReferenceRange.Start, Diag,
-        prettyPlatformString(targetPlatform(Context.LangOpts)),
+        Context.getTargetPlatformStringForDiagnostics(),
         Availability.getRawMinimumVersion());
 
     // Direct a fixit to the error if an existing guard is nearly-correct
@@ -2122,7 +2122,7 @@ static Diagnostic getPotentialUnavailabilityDiagnostic(
     const AvailabilityContext &Availability, bool WarnBeforeDeploymentTarget,
     bool &IsError) {
   ASTContext &Context = ReferenceDC->getASTContext();
-  auto Platform = prettyPlatformString(targetPlatform(Context.LangOpts));
+  auto Platform = Context.getTargetPlatformStringForDiagnostics();
 
   if (requiresDeploymentTargetOrEarlier(Availability, Context)) {
     // The required OS version is at or before the deployment target so this
@@ -2179,7 +2179,7 @@ void TypeChecker::diagnosePotentialAccessorUnavailability(
   {
     auto Err = Context.Diags.diagnose(
         ReferenceRange.Start, diag, Accessor,
-        prettyPlatformString(targetPlatform(Context.LangOpts)),
+        Context.getTargetPlatformStringForDiagnostics(),
         Availability.getRawMinimumVersion());
 
     // Direct a fixit to the error if an existing guard is nearly-correct
@@ -2221,7 +2221,7 @@ void TypeChecker::diagnosePotentialUnavailability(
     auto proto = rootConf->getProtocol()->getDeclaredInterfaceType();
     auto err = ctx.Diags.diagnose(
         loc, diag::conformance_availability_only_version_newer, type, proto,
-        prettyPlatformString(targetPlatform(ctx.LangOpts)),
+        ctx.getTargetPlatformStringForDiagnostics(),
         availability.getRawMinimumVersion());
 
     err.warnUntilSwiftVersion(6);

lib/Sema/TypeCheckDeclObjC.cpp

@@ -574,14 +574,13 @@ static bool checkObjCInExtensionContext(const ValueDecl *value,
               AncestryFlags::ResilientOther) ||
             classDecl->hasResilientMetadata(mod,
                                             ResilienceExpansion::Maximal)) {
-          auto platform = prettyPlatformString(targetPlatform(ctx.LangOpts));
           auto stubAvailability = getObjCClassStubAvailability(ctx);
           auto *ancestor = getResilientAncestor(mod, classDecl);
           softenIfAccessNote(value, reason.getAttr(),
             value->diagnose(diag::objc_in_resilient_extension,
                             value->getDescriptiveKind(),
                             ancestor->getName(),
-                            platform,
+                            ctx.getTargetPlatformStringForDiagnostics(),
                             stubAvailability.getRawMinimumVersion())
                 .limitBehavior(behavior));
           reason.describe(value);
@@ -1322,11 +1321,11 @@ static std::optional<ObjCReason> shouldMarkClassAsObjC(const ClassDecl *CD) {
         return std::nullopt;
       }
 
-      auto platform = prettyPlatformString(targetPlatform(ctx.LangOpts));
       auto stubAvailability = getObjCClassStubAvailability(ctx);
       auto *ancestor = getResilientAncestor(CD->getParentModule(), CD);
       swift::diagnoseAndRemoveAttr(CD, attr, diag::objc_for_resilient_class,
-                                   ancestor->getName(), platform,
+                                   ancestor->getName(),
+                                   ctx.getTargetPlatformStringForDiagnostics(),
                                    stubAvailability.getRawMinimumVersion())
           .limitBehavior(behavior);
       reason.describe(CD);

lib/Sema/TypeCheckProtocol.cpp

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