Merge pull request #66948 from DougGregor/sendable-subtype-convertible-fixes-5.9

Author: DougGregor

include/swift/AST/DiagnosticsSema.def

@@ -5163,13 +5163,13 @@ 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 %4 %2 %3 satisfying protocol requirement|"
-        "in parameter of %4 overriding %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))
-WARNING(non_sendable_call_param_type,none,
-        "non-sendable type %0 passed in %select{implicitly asynchronous |}1"
-        "call to %2 function cannot cross actor boundary",
+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|"