Merge pull request swiftlang#71829 from gottesmm/pr-071a183496e8c0d173d958388af193d807f57f56

[region-isolation] Change two diagnostics to use the user facing sugared type instead of the SIL type

Author: gottesmm

lib/SILOptimizer/Mandatory/TransferNonSendable.cpp

@@ -1038,12 +1038,13 @@ class TransferNonTransferrableDiagnosticInferrer {
     }
 
     static UseDiagnosticInfo
-    forFunctionArgumentClosure(ApplyIsolationCrossing isolation) {
-      return {UseDiagnosticInfoKind::FunctionArgumentClosure, isolation};
+    forFunctionArgumentClosure(ApplyIsolationCrossing isolation, Type inferredType) {
+      return {UseDiagnosticInfoKind::FunctionArgumentClosure, isolation, inferredType};
     }
 
-    static UseDiagnosticInfo forFunctionArgumentApplyStronglyTransferred() {
-      return {UseDiagnosticInfoKind::FunctionArgumentApplyStronglyTransferred};
+    static UseDiagnosticInfo forFunctionArgumentApplyStronglyTransferred(Type inferredType) {
+      return {UseDiagnosticInfoKind::FunctionArgumentApplyStronglyTransferred, {},
+        inferredType};
     }
 
     static UseDiagnosticInfo
@@ -1106,8 +1107,9 @@ bool TransferNonTransferrableDiagnosticInferrer::initForIsolatedPartialApply(
   for (auto &p : foundCapturedIsolationCrossing) {
     if (std::get<1>(p) == opIndex) {
       loc = std::get<0>(p).getLoc();
+      Type type = std::get<0>(p).getDecl()->getInterfaceType();
       diagnosticInfo =
-          UseDiagnosticInfo::forFunctionArgumentClosure(std::get<2>(p));
+        UseDiagnosticInfo::forFunctionArgumentClosure(std::get<2>(p), type);
       return true;
     }
   }
@@ -1155,8 +1157,14 @@ bool TransferNonTransferrableDiagnosticInferrer::run() {
       if (auto fas = FullApplySite::isa(op->getUser())) {
         if (fas.getArgumentParameterInfo(*op).hasOption(
                 SILParameterInfo::Transferring)) {
+          Type type = op->get()->getType().getASTType();
+          if (auto *inferredArgExpr =
+              inferArgumentExprFromApplyExpr(sourceApply, fas, op)) {
+            type = inferredArgExpr->findOriginalType();
+          }
+
           diagnosticInfo =
-              UseDiagnosticInfo::forFunctionArgumentApplyStronglyTransferred();
+              UseDiagnosticInfo::forFunctionArgumentApplyStronglyTransferred(type);
           return true;
         }
       }
@@ -1262,7 +1270,7 @@ void TransferNonSendableImpl::emitTransferredNonTransferrableDiagnostics() {
     }
     case UseDiagnosticInfoKind::FunctionArgumentClosure: {
       diagnoseError(astContext, loc, diag::regionbasedisolation_arg_transferred,
-                    op->get()->getType().getASTType(),
+                    diagnosticInfo.getType(),
                     diagnosticInfo.getIsolationCrossing().getCalleeIsolation())
           .highlight(op->getUser()->getLoc().getSourceRange());
       // Only emit the note if our value is different from the function
@@ -1283,7 +1291,7 @@ void TransferNonSendableImpl::emitTransferredNonTransferrableDiagnostics() {
       diagnoseError(
           astContext, loc,
           diag::regionbasedisolation_arg_passed_to_strongly_transferred_param,
-          op->get()->getType().getASTType())
+          diagnosticInfo.getType())
           .highlight(op->getUser()->getLoc().getSourceRange());
       break;
     }

test/Concurrency/transfernonsendable.swift

@@ -1465,3 +1465,9 @@ final actor FinalActorWithSetter {
     // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 }
+
+func functionArgumentIntoClosure(_ x: @escaping () -> ()) async {
+  let _ = { @MainActor in
+    let _ = x // expected-tns-warning {{task isolated value of type '() -> ()' transferred to main actor-isolated context}}
+  }
+}

test/Concurrency/transfernonsendable_strong_transferring_params.swift

@@ -346,3 +346,9 @@ func testTransferOtherParamClassStructTuple(_ x: transferring Klass, y: KlassWit
   x = y.ns2.1.second // expected-warning {{assigning 'y.ns2.1.second' to transferring parameter 'x' may cause a race}}
   // expected-note @-1 {{'y.ns2.1.second' is a task isolated value that is assigned into transferring parameter 'x'. Transferred uses of 'x' may race with caller uses of 'y.ns2.1.second'}}
 }
+
+func useSugaredTypeNameWhenEmittingTaskIsolationError(_ x: @escaping @MainActor () async -> ()) {
+  func fakeInit(operation: transferring @escaping () async -> ()) {}
+
+  fakeInit(operation: x) // expected-warning {{task isolated value of type '@MainActor () async -> ()' passed as a strongly transferred parameter}}
+}