Adopt %kind in Sendable checking diagnostic

Causes minor changes in diagnostic text.

Author: beccadax

include/swift/AST/DiagnosticsSema.def

@@ -5282,39 +5282,39 @@ ERROR(isolated_parameter_combined_nonisolated,none,
       (DescriptiveDeclKind))
 
 WARNING(non_sendable_param_type,none,
-        "non-sendable type %0 %select{passed in call to %4 %2 %3|"
-        "exiting %4 context in call to non-isolated %2 %3|"
-        "passed in implicitly asynchronous call to %4 %2 %3|"
-        "in parameter of the protocol requirement satisfied by %4 %2 %3|"
-        "in parameter of superclass method overridden by %4 %2 %3|"
-        "in parameter of %4 '@objc' %2 %3}1 cannot cross actor boundary",
-        (Type, unsigned, DescriptiveDeclKind, DeclName, ActorIsolation))
+        "non-sendable type %0 %select{passed in call to %3 %kind2|"
+        "exiting %3 context in call to non-isolated %kind2|"
+        "passed in implicitly asynchronous call to %3 %kind2|"
+        "in parameter of the protocol requirement satisfied by %3 %kind2|"
+        "in parameter of superclass method overridden by %3 %kind2|"
+        "in parameter of %3 '@objc' %kind2}1 cannot cross actor boundary",
+        (Type, unsigned, const ValueDecl *, ActorIsolation))
 WARNING(non_sendable_call_argument,none,
         "passing argument of non-sendable type %0 %select{into %2 context|"
         "outside of %2 context}1 may introduce data races",
         (Type, bool, ActorIsolation))
 WARNING(non_sendable_result_type,none,
-        "non-sendable type %0 returned by %select{call to %4 %2 %3|"
-        "call from %4 context to non-isolated %2 %3|"
-        "implicitly asynchronous call to %4 %2 %3|"
-        "%4 %2 %3 satisfying protocol requirement|"
-        "%4 overriding %2 %3|"
-        "%4 '@objc' %2 %3}1 cannot cross actor boundary",
-        (Type, unsigned, DescriptiveDeclKind, DeclName, ActorIsolation))
+        "non-sendable type %0 returned by %select{call to %3 %kind2|"
+        "call from %4 context to non-isolated %kind2|"
+        "implicitly asynchronous call to %3 %kind2|"
+        "%3 %kind2 satisfying protocol requirement|"
+        "%3 overriding %kind2|"
+        "%3 '@objc' %kind2}1 cannot cross actor boundary",
+        (Type, unsigned, const ValueDecl *, ActorIsolation))
 WARNING(non_sendable_call_result_type,none,
         "non-sendable type %0 returned by %select{implicitly asynchronous |}1"
         "call to %2 function cannot cross actor boundary",
         (Type, bool, ActorIsolation))
 WARNING(non_sendable_property_type,none,
         "non-sendable type %0 in %select{"
-        "%select{asynchronous access to %5 %1 %2|"
-        "asynchronous access from %5 context to non-isolated %1 %2|"
-        "implicitly asynchronous access to %5 %1 %2|"
-        "conformance of %5 %1 %2 to protocol requirement|"
-        "%5 overriding %1 %2|"
-        "%5 '@objc' %1 %2}4|captured local %1 %2}3 cannot "
-        "cross %select{actor|task}3 boundary",
-        (Type, DescriptiveDeclKind, DeclName, bool, unsigned, ActorIsolation))
+        "%select{asynchronous access to %4 %kind1|"
+        "asynchronous access from %4 context to non-isolated %kind1|"
+        "implicitly asynchronous access to %4 %kind1|"
+        "conformance of %4 %kind1 to protocol requirement|"
+        "%4 overriding %kind1|"
+        "%4 '@objc' %kind1}3|captured local %1}2 cannot "
+        "cross %select{actor|task}2 boundary",
+        (Type, const ValueDecl *, bool, unsigned, ActorIsolation))
 WARNING(non_sendable_keypath_capture,none,
         "cannot form key path that captures non-sendable type %0",
         (Type))

lib/Sema/TypeCheckConcurrency.cpp

@@ -1025,8 +1025,7 @@ bool swift::diagnoseNonSendableTypesInReference(
         if (diagnoseNonSendableTypes(
             paramType, fromDC, refLoc, diagnoseLoc.isInvalid() ? refLoc : diagnoseLoc,
                 diag::non_sendable_param_type,
-            (unsigned)refKind, function->getDescriptiveKind(),
-            function->getName(), getActorIsolation()))
+            (unsigned)refKind, function, getActorIsolation()))
           return true;
       }
     }
@@ -1039,8 +1038,7 @@ bool swift::diagnoseNonSendableTypesInReference(
         if (diagnoseNonSendableTypes(
             resultType, fromDC, refLoc, diagnoseLoc.isInvalid() ? refLoc : diagnoseLoc,
                 diag::non_sendable_result_type,
-            (unsigned)refKind, func->getDescriptiveKind(), func->getName(),
-            getActorIsolation()))
+            (unsigned)refKind, func, getActorIsolation()))
           return true;
       }
     }
@@ -1055,7 +1053,7 @@ bool swift::diagnoseNonSendableTypesInReference(
     if (diagnoseNonSendableTypes(
             propertyType, fromDC, refLoc,
             diag::non_sendable_property_type,
-            var->getDescriptiveKind(), var->getName(),
+            var,
             var->isLocalCapture(),
             (unsigned)refKind,
             getActorIsolation()))
@@ -1070,8 +1068,7 @@ bool swift::diagnoseNonSendableTypesInReference(
         if (diagnoseNonSendableTypes(
                 paramType, fromDC, refLoc, diagnoseLoc.isInvalid() ? refLoc : diagnoseLoc,
                 diag::non_sendable_param_type,
-                (unsigned)refKind, subscript->getDescriptiveKind(),
-                subscript->getName(), getActorIsolation()))
+                (unsigned)refKind, subscript, getActorIsolation()))
           return true;
       }
     }
@@ -1082,8 +1079,7 @@ bool swift::diagnoseNonSendableTypesInReference(
       if (diagnoseNonSendableTypes(
           resultType, fromDC, refLoc, diagnoseLoc.isInvalid() ? refLoc : diagnoseLoc,
               diag::non_sendable_result_type,
-          (unsigned)refKind, subscript->getDescriptiveKind(),
-          subscript->getName(), getActorIsolation()))
+          (unsigned)refKind, subscript, getActorIsolation()))
         return true;
     }
 

test/Concurrency/sendable_checking.swift

@@ -210,7 +210,7 @@ class SubWUnsafeSubscript : SuperWUnsafeSubscript {
   override nonisolated subscript<T>(x : T) -> Int {
     get async {
       // expected-warning@-2{{non-sendable type 'T' in parameter of superclass method overridden by nonisolated subscript 'subscript(_:)' cannot cross actor boundary}}
-      // expected-warning@-2{{non-sendable type 'T' in parameter of superclass method overridden by nonisolated getter '_' cannot cross actor boundary}}
+      // expected-warning@-2{{non-sendable type 'T' in parameter of superclass method overridden by nonisolated getter for subscript 'subscript(_:)' cannot cross actor boundary}}
       // there really shouldn't be two warnings produced here, see rdar://110846040 (Sendable diagnostics reported twice for subscript getters)
       return 0
     }