[NFC] Adopt new features in availability diagnostics

Allows the removal of a helper function.

Author: beccadax

include/swift/AST/DiagnosticEngine.h

@@ -1498,13 +1498,6 @@ namespace swift {
     const StringRef Message;
   };
 
-/// Returns a value that can be used to select between accessor kinds in
-/// diagnostics.
-///
-/// This is correlated with diag::availability_deprecated and others.
-std::pair<unsigned, DeclName>
-getAccessorKindAndNameForDiagnostics(const ValueDecl *D);
-
 /// Retrieve the macro name for a generated source info that represents
 /// a macro expansion.
 DeclName getGeneratedSourceInfoMacroName(const GeneratedSourceInfo &info);

include/swift/AST/DiagnosticsIDE.def

@@ -38,17 +38,17 @@ NOTE(ide_redundant_import_indirect, none,
      "module %0 is already imported via another module import", (StringRef))
 
 WARNING(ide_availability_softdeprecated, Deprecation,
-        "%select{getter for |setter for |}0%1 will be deprecated"
-        " in %select{a future version|%select{a future version of %3|%3 %5}4}2"
-        "%select{|: %6}6",
-        (unsigned, DeclName, bool, StringRef, bool, llvm::VersionTuple,
+        "%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,
          StringRef))
 
 WARNING(ide_availability_softdeprecated_rename, Deprecation,
-        "%select{getter for |setter for |}0%1 will be deprecated"
-        " in %select{a future version|%select{a future version of %3|%3 %5}4}2"
-        ": renamed to '%6'",
-        (unsigned, DeclName, bool, StringRef, bool, llvm::VersionTuple, StringRef))
+        "%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))
 
 WARNING(ide_recursive_accessor_reference,none,
         "attempting to %select{access|modify}1 %0 within its own "

include/swift/AST/DiagnosticsSema.def

@@ -3638,14 +3638,13 @@ ERROR(attr_not_on_decl_with_invalid_access_level,none,
       (DeclAttribute, AccessLevel))
 
 ERROR(attr_has_no_effect_decl_not_available_before,none,
-      "'%0' has no effect because %select{getter for |setter for |}1%2 is not "
-      "available before %3 %4",
-      (DeclAttribute, unsigned, DeclName, StringRef, llvm::VersionTuple))
+      "'%0' has no effect because %1 is not "
+      "available before %2 %3",
+      (DeclAttribute, const ValueDecl *, StringRef, llvm::VersionTuple))
 
 ERROR(attr_has_no_effect_on_unavailable_decl,none,
-      "'%0' has no effect because %select{getter for |setter for |}1%2 is "
-      "unavailable on %3",
-      (DeclAttribute, unsigned, DeclName, StringRef))
+      "'%0' has no effect because %1 is unavailable on %2",
+      (DeclAttribute, const ValueDecl *, StringRef))
 
 ERROR(attr_ambiguous_reference_to_decl,none,
       "ambiguous reference to %0 in '@%1' attribute", (DeclNameRef, StringRef))
@@ -6212,52 +6211,39 @@ NOTE(type_eraser_init_spi,none,
 //------------------------------------------------------------------------------
 
 ERROR(availability_decl_unavailable, none,
-      "%select{getter for |setter for |}0%1 is unavailable"
-      "%select{ in %3|}2%select{|: %4}4",
-      (unsigned, DeclName, bool, StringRef, StringRef))
-
-WARNING(availability_decl_unavailable_warn, none,
-        "%select{getter for |setter for |}0%1 is unavailable"
-        "%select{ in %3|}2%select{|: %4}4",
-        (unsigned, DeclName, bool, StringRef, StringRef))
+      "%0 is unavailable%select{ in %2|}1%select{|: %3}3",
+      (const ValueDecl *, bool, StringRef, StringRef))
 
 #define REPLACEMENT_DECL_KIND_SELECT "select{| instance method| property}"
 ERROR(availability_decl_unavailable_rename, none,
-      "%select{getter for |setter for |}0%1 has been "
-      "%select{renamed to|replaced by}2%" REPLACEMENT_DECL_KIND_SELECT "3 "
-      "'%4'%select{|: %5}5",
-      (unsigned, DeclName, bool, unsigned, StringRef, StringRef))
-
-WARNING(availability_decl_unavailable_rename_warn, none,
-        "%select{getter for |setter for |}0%1 has been "
-        "%select{renamed to|replaced by}2%" REPLACEMENT_DECL_KIND_SELECT "3 "
-        "'%4'%select{|: %5}5",
-        (unsigned, DeclName, bool, unsigned, StringRef, StringRef))
+      "%0 has been %select{renamed to|replaced by}1"
+      "%" REPLACEMENT_DECL_KIND_SELECT "2 '%3'%select{|: %4}4",
+      (const ValueDecl *, bool, unsigned, StringRef, StringRef))
 
 NOTE(availability_marked_unavailable, none,
-     "%select{getter for |setter for |}0%1 has been explicitly marked "
-     "unavailable here", (unsigned, DeclName))
+     "%0 has been explicitly marked unavailable here",
+     (const ValueDecl *))
 
 NOTE(availability_introduced_in_version, none,
-     "%select{getter for |setter for |}0%1 was introduced in %2 %3",
-     (unsigned, DeclName, StringRef, llvm::VersionTuple))
+     "%0 was introduced in %1 %2",
+     (const ValueDecl *, StringRef, llvm::VersionTuple))
 
 NOTE(availability_obsoleted, none,
-     "%select{getter for |setter for |}0%1 was obsoleted in %2 %3",
-     (unsigned, DeclName, StringRef, llvm::VersionTuple))
+     "%0 was obsoleted in %1 %2",
+     (const ValueDecl *, StringRef, llvm::VersionTuple))
 
 WARNING(availability_deprecated, Deprecation,
-        "%select{getter for |setter for |}0%1 %select{is|%select{is|was}4}2 "
-        "deprecated%select{| in %3%select{| %5}4}2%select{|: %6}6",
-        (unsigned, DeclName, bool, StringRef, bool, llvm::VersionTuple,
+        "%0 %select{is|%select{is|was}3}1 "
+        "deprecated%select{| in %2%select{| %4}3}1%select{|: %5}5",
+        (const ValueDecl *, bool, StringRef, bool, llvm::VersionTuple,
          StringRef))
 
 WARNING(availability_deprecated_rename, Deprecation,
-        "%select{getter for |setter for |}0%1 %select{is|%select{is|was}4}2 "
-        "deprecated%select{| in %3%select{| %5}4}2: "
-        "%select{renamed to|replaced by}6%" REPLACEMENT_DECL_KIND_SELECT "7 "
-        "'%8'",
-        (unsigned, DeclName, bool, StringRef, bool, llvm::VersionTuple, bool,
+        "%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, StringRef, bool, llvm::VersionTuple, bool,
          unsigned, StringRef))
 #undef REPLACEMENT_DECL_KIND_SELECT
 

lib/AST/DiagnosticEngine.cpp

@@ -1577,22 +1577,6 @@ EncodedDiagnosticMessage::EncodedDiagnosticMessage(StringRef S)
                                              /*IsLastSegment=*/true,
                                              /*IndentToStrip=*/~0U)) {}
 
-std::pair<unsigned, DeclName>
-swift::getAccessorKindAndNameForDiagnostics(const ValueDecl *D) {
-  // This should always be one more than the last AccessorKind supported in
-  // the diagnostics. If you need to change it, change the assertion below as
-  // well.
-  static const unsigned NOT_ACCESSOR_INDEX = 2;
-
-  if (auto *accessor = dyn_cast<AccessorDecl>(D)) {
-    DeclName Name = accessor->getStorage()->getName();
-    assert(accessor->isGetterOrSetter());
-    return {static_cast<unsigned>(accessor->getAccessorKind()), Name};
-  }
-
-  return {NOT_ACCESSOR_INDEX, D->getName()};
-}
-
 DeclName
 swift::getGeneratedSourceInfoMacroName(const GeneratedSourceInfo &info) {
   ASTNode expansionNode = ASTNode::getFromOpaqueValue(info.astNode);

lib/IDE/CodeCompletionDiagnostics.cpp

@@ -86,11 +86,7 @@ bool CodeCompletionDiagnostics::getDiagnosticForDeprecated(
   if (!Attr)
     return true;
 
-  DeclName Name;
-  unsigned RawAccessorKind;
-  std::tie(RawAccessorKind, Name) = getAccessorKindAndNameForDiagnostics(D);
-  // FIXME: 'RawAccessorKind' is always 2 (NOT_ACCESSOR_INDEX).
-  // Code completion doesn't offer accessors. It only emits 'VarDecl's.
+  // FIXME: Code completion doesn't offer accessors. It only emits 'VarDecl's.
   // So getter/setter specific availability doesn't work in code completion.
 
   StringRef Platform = Attr->prettyPlatformString();
@@ -101,18 +97,18 @@ bool CodeCompletionDiagnostics::getDiagnosticForDeprecated(
   if (!isSoftDeprecated) {
     if (Attr->Message.empty() && Attr->Rename.empty()) {
       getDiagnostics(severity, Out, diag::availability_deprecated,
-                     RawAccessorKind, Name, Attr->hasPlatform(), Platform,
+                     D, Attr->hasPlatform(), Platform,
                      Attr->Deprecated.has_value(), DeprecatedVersion,
                      /*message*/ StringRef());
     } else if (!Attr->Message.empty()) {
       EncodedDiagnosticMessage EncodedMessage(Attr->Message);
       getDiagnostics(severity, Out, diag::availability_deprecated,
-                     RawAccessorKind, Name, Attr->hasPlatform(), Platform,
+                     D, Attr->hasPlatform(), Platform,
                      Attr->Deprecated.has_value(), DeprecatedVersion,
                      EncodedMessage.Message);
     } else {
       getDiagnostics(severity, Out, diag::availability_deprecated_rename,
-                     RawAccessorKind, Name, Attr->hasPlatform(), Platform,
+                     D, Attr->hasPlatform(), Platform,
                      Attr->Deprecated.has_value(), DeprecatedVersion, false,
                      /*ReplaceKind*/ 0, Attr->Rename);
     }
@@ -125,18 +121,18 @@ bool CodeCompletionDiagnostics::getDiagnosticForDeprecated(
 
     if (Attr->Message.empty() && Attr->Rename.empty()) {
       getDiagnostics(severity, Out, diag::ide_availability_softdeprecated,
-                     RawAccessorKind, Name, Attr->hasPlatform(), Platform,
+                     D, Attr->hasPlatform(), Platform,
                      !isDistantFuture, DeprecatedVersion,
                      /*message*/ StringRef());
     } else if (!Attr->Message.empty()) {
       EncodedDiagnosticMessage EncodedMessage(Attr->Message);
       getDiagnostics(severity, Out, diag::ide_availability_softdeprecated,
-                     RawAccessorKind, Name, Attr->hasPlatform(), Platform,
+                     D, Attr->hasPlatform(), Platform,
                      !isDistantFuture, DeprecatedVersion,
                      EncodedMessage.Message);
     } else {
       getDiagnostics(severity, Out, diag::ide_availability_softdeprecated_rename,
-                     RawAccessorKind, Name, Attr->hasPlatform(), Platform,
+                     D, Attr->hasPlatform(), Platform,
                      !isDistantFuture, DeprecatedVersion, Attr->Rename);
     }
   }

lib/Sema/TypeCheckAttr.cpp

@@ -4406,13 +4406,10 @@ void AttributeChecker::checkBackDeployedAttrs(
 
       if (unavailableAttr->Platform == PlatformKind::none ||
           unavailableAttr->Platform == Attr->Platform) {
-        DeclName name;
-        unsigned accessorKind;
-        std::tie(accessorKind, name) = getAccessorKindAndNameForDiagnostics(VD);
         diagnose(AtLoc, diag::attr_has_no_effect_on_unavailable_decl, Attr,
-                 accessorKind, name, prettyPlatformString(Platform));
+                 VD, prettyPlatformString(Platform));
         diagnose(unavailableAttr->AtLoc, diag::availability_marked_unavailable,
-                 accessorKind, name)
+                 VD)
             .highlight(unavailableAttr->getRange());
         continue;
       }
@@ -4424,15 +4421,11 @@ void AttributeChecker::checkBackDeployedAttrs(
     if (auto availableRangeAttrPair = VD->getSemanticAvailableRangeAttr()) {
       auto availableAttr = availableRangeAttrPair.value().first;
       if (Attr->Version <= availableAttr->Introduced.value()) {
-        DeclName name;
-        unsigned accessorKind;
-        std::tie(accessorKind, name) = getAccessorKindAndNameForDiagnostics(VD);
         diagnose(AtLoc, diag::attr_has_no_effect_decl_not_available_before,
-                 Attr, accessorKind, name, prettyPlatformString(Platform),
+                 Attr, VD, prettyPlatformString(Platform),
                  Attr->Version);
         diagnose(availableAttr->AtLoc, diag::availability_introduced_in_version,
-                 accessorKind, name,
-                 prettyPlatformString(availableAttr->Platform),
+                 VD, prettyPlatformString(availableAttr->Platform),
                  *availableAttr->Introduced)
             .highlight(availableAttr->getRange());
         continue;