Merge pull request #77237 from tshortli/fix-resilience-diagnostic

Sema: Correct the decl kind in a resilience diagnostic

Author: tshortli

lib/Sema/ResilienceDiagnostics.cpp

@@ -300,7 +300,7 @@ static bool diagnoseValueDeclRefExportability(SourceLoc loc, const ValueDecl *D,
                        static_cast<unsigned>(originKind))
         .limitBehavior(limit);
 
-    D->diagnose(diag::kind_declared_here, DescriptiveDeclKind::Type);
+    D->diagnose(diag::kind_declared_here, D->getDescriptiveKind());
   } else {
     // Only implicitly imported decls should be reported as a warning,
     // and only for language versions below Swift 6.

test/SPI/local_spi_decls.swift

@@ -14,13 +14,13 @@
 @_spi() public func emptyParensSPI() {} // expected-error {{expected an SPI identifier as subject of the '@_spi' attribute}}
 @_spi(set) public func keywordSPI() {} // expected-error {{expected an SPI identifier as subject of the '@_spi' attribute}}
 
-@_spi(S) public class SPIClass { // expected-note 6 {{type declared here}}
+@_spi(S) public class SPIClass { // expected-note 6 {{class declared here}}
   public init() {}
 }
 class InternalClass {} // expected-note 2 {{type declared here}}
 private class PrivateClass {} // expected-note 2 {{type declared here}}
 
-@_spi(S) public protocol SPIProtocol {} // expected-note {{type declared here}}
+@_spi(S) public protocol SPIProtocol {} // expected-note {{protocol declared here}}
 
 @_spi(S) public func useOfSPITypeOk(_ p0: SPIProtocol, p1: SPIClass) -> SPIClass { fatalError() } // OK
 public func useOfSPITypeInvalid() -> SPIClass { fatalError() } // expected-error {{cannot use class 'SPIClass' here; it is SPI}}
@@ -42,7 +42,7 @@ func inlinable() -> SPIClass { // expected-error {{class 'SPIClass' cannot be us
 }
 
 @_spi(S) public struct SPIStruct {
-// expected-note@-1 {{type declared here}}
+// expected-note@-1 {{struct declared here}}
   public init() {}
 }
 

test/SPI/spi_enum_element.swift

@@ -32,7 +32,7 @@ public enum PublicEnum {
 }
 
 public struct PublicStruct {}
-@_spi(S) public struct SPIStruct {} // expected-note {{type declared here}}
+@_spi(S) public struct SPIStruct {} // expected-note {{struct declared here}}
 
 public enum PublicEnumWithPayloads {
   case publicCasePublicPayload(_ s: PublicStruct)

test/SPI/spi_global_actor.swift

@@ -5,7 +5,7 @@
 @available(SwiftStdlib 5.1, *)
 @_spi(Foo)
 @globalActor
-public struct SPIGA { // expected-note {{type declared here}}
+public struct SPIGA { // expected-note {{struct declared here}}
   public actor Actor {}
   public static let shared = Actor()
 }

test/SPI/spi_members.swift

@@ -9,7 +9,7 @@ public struct Wrapper<T> {
 
 @_spi(Foo)
 public class Bar {
-  // expected-note@-1 16{{type declared here}}
+  // expected-note@-1 16{{class declared here}}
 
   public init() {}
 }

test/Sema/spi-available-context.swift

@@ -3,7 +3,7 @@
 
 @_spi_available(macOS 10.10, *)
 @available(iOS 8.0, *)
-public protocol MacOSSPIProto {} // expected-note {{type declared here}}
+public protocol MacOSSPIProto {} // expected-note {{protocol declared here}}
 
 @_spi_available(iOS 8.0, *)
 @available(macOS 10.10, *)

test/Sema/spi-available-local.swift

@@ -3,7 +3,7 @@
 
 @_spi_available(macOS 10.10, *)
 @available(iOS 8.0, *)
-public class MacOSSPIClass {} // expected-note {{type declared here}}
+public class MacOSSPIClass {} // expected-note {{class declared here}}
 
 @_spi_available(iOS 8.0, *)
 @available(macOS 10.10, *)

test/Sema/spi-in-decls.swift

@@ -22,21 +22,21 @@ extension NormalClass: @retroactive NormalProto {
 }
 
 @_spi(X)
-public struct BadStruct {} // expected-note 34 {{type declared here}}
+public struct BadStruct {} // expected-note 34 {{struct declared here}}
 @_spi(X)
-public protocol BadProto {} // expected-note 20 {{type declared here}}
+public protocol BadProto {} // expected-note 20 {{protocol declared here}}
 @_spi(X)
-open class BadClass {} // expected-note 2 {{type declared here}}
+open class BadClass {} // expected-note 2 {{class declared here}}
 
 @_spi(X)
-public struct IntLike: ExpressibleByIntegerLiteral, Equatable { // expected-note {{type declared here}}
+public struct IntLike: ExpressibleByIntegerLiteral, Equatable { // expected-note {{struct declared here}}
   public init(integerLiteral: Int) {}
 }
 
 @_spi(X)
 @propertyWrapper
-public struct BadWrapper { // expected-note {{type declared here}}
-    public var wrappedValue: Int // expected-note {{type declared here}}
+public struct BadWrapper { // expected-note {{struct declared here}}
+    public var wrappedValue: Int // expected-note {{property declared here}}
     public init(wrappedValue: Int) {
         self.wrappedValue = wrappedValue
     }