Remove diag::descriptive_decl_declared_here

It was used in one place to handle accessors, which happily is no longer necessary.
swiftlang · Jul 1, 2023 · 71bca16 · 71bca16
1 parent f3dcacc
commit 71bca16
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -34,8 +34,6 @@ NOTE(name_declared_here,none,
      "%0 declared here", (DeclName))
 NOTE(kind_declared_here,none,
      "%0 declared here", (DescriptiveDeclKind))
-NOTE(descriptive_decl_declared_here,none,
-     "'%0' declared here", (StringRef))
 NOTE(implicit_member_declared_here,none,
      "%kindbase0 is implicitly declared", (const ValueDecl *))
 NOTE(extended_type_declared_here,none,

diff --git a/lib/Sema/TypeCheckAvailability.cpp b/lib/Sema/TypeCheckAvailability.cpp
@@ -3573,15 +3573,7 @@ diagnoseDeclAsyncAvailability(const ValueDecl *D, SourceRange R,
     if (const AbstractFunctionDecl *asyncAlt = afd->getAsyncAlternative()) {
       SourceLoc diagLoc = call ? call->getLoc() : R.Start;
       ctx.Diags.diagnose(diagLoc, diag::warn_use_async_alternative);
-      if (auto *accessor = dyn_cast<AccessorDecl>(asyncAlt)) {
-        SmallString<32> name;
-        llvm::raw_svector_ostream os(name);
-        accessor->printUserFacingName(os);
-        ctx.Diags.diagnose(asyncAlt->getLoc(),
-                           diag::descriptive_decl_declared_here, name);
-      } else {
-        asyncAlt->diagnose(diag::decl_declared_here, asyncAlt);
-      }
+      asyncAlt->diagnose(diag::decl_declared_here, asyncAlt);
     }
   }
 

diff --git a/test/attr/attr_availability_async_rename.swift b/test/attr/attr_availability_async_rename.swift
@@ -118,10 +118,10 @@ struct SomeStruct {
   // expected-note@+1 2 {{'staticStructFunc()' declared here}}
   static func staticStructFunc() async { }
 
-  // expected-note@+1 3 {{'getter:instanceProp()' declared here}}
+  // expected-note@+1 3 {{getter for 'instanceProp' declared here}}
   var instanceProp: Int { get async { 1 } }
   var regInstanceProp: Int { get { 1 } set { } }
-  // expected-note@+1 {{'getter:classProp()' declared here}}
+  // expected-note@+1 {{getter for 'classProp' declared here}}
   static var classProp: Int { get async { 1 } }
 
   @available(*, renamed: "getter:instanceProp()")