[region-isolation] Standardize on task-isolated instead of task isolated.

This matches actor-isolated as used in other parts of the compiler.

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -954,10 +954,10 @@ ERROR(regionbasedisolation_transfer_yields_race_stronglytransferred_binding, non
       "binding of non-Sendable type %0 accessed after being transferred; later accesses could race",
       (Type))
 ERROR(regionbasedisolation_arg_transferred, none,
-      "task isolated value of type %0 transferred to %1 context; later accesses to value could race",
+      "task-isolated value of type %0 transferred to %1 context; later accesses to value could race",
       (Type, ActorIsolation))
 ERROR(regionbasedisolation_arg_passed_to_strongly_transferred_param, none,
-      "task isolated value of type %0 passed as a strongly transferred parameter; later accesses could race",
+      "task-isolated value of type %0 passed as a strongly transferred parameter; later accesses could race",
       (Type))
 NOTE(regionbasedisolation_isolated_since_in_same_region_basename, none,
      "value is %0 since it is in the same region as %1",
@@ -974,7 +974,7 @@ ERROR(regionbasedisolation_stronglytransfer_assignment_yields_race_name, none,
       "assigning %0 to transferring parameter %1 may cause a race",
       (Identifier, Identifier))
 NOTE(regionbasedisolation_stronglytransfer_taskisolated_assign_note, none,
-      "%0 is a task isolated value that is assigned into transferring parameter %1. Transferred uses of %1 may race with caller uses of %0",
+      "%0 is a task-isolated value that is assigned into transferring parameter %1. Transferred uses of %1 may race with caller uses of %0",
       (Identifier, Identifier))
 
 NOTE(regionbasedisolation_named_info_transfer_yields_race, none,
@@ -987,7 +987,7 @@ NOTE(regionbasedisolation_named_info_isolated_capture, none,
      "%1 value %0 is captured by %2 closure. Later local uses could race",
      (Identifier, ActorIsolation, ActorIsolation))
 NOTE(regionbasedisolation_named_arg_info, none,
-     "Transferring task isolated function argument %0 could yield races with caller uses",
+     "Transferring task-isolated function argument %0 could yield races with caller uses",
      (Identifier))
 NOTE(regionbasedisolation_named_stronglytransferred_binding, none,
      "Cannot access a transferring parameter after the parameter has been transferred", ())

lib/SILOptimizer/Mandatory/TransferNonSendable.cpp

@@ -909,7 +909,7 @@ class TransferNonTransferrableDiagnosticEmitter {
         diagnoseNote(
             fArg->getDecl()->getLoc(),
             diag::regionbasedisolation_isolated_since_in_same_region_basename,
-            "task isolated", fArg->getDecl()->getBaseName());
+            "task-isolated", fArg->getDecl()->getBaseName());
       }
     }
   }
@@ -930,7 +930,7 @@ class TransferNonTransferrableDiagnosticEmitter {
     diagnoseNote(
         fArg->getDecl()->getLoc(),
         diag::regionbasedisolation_isolated_since_in_same_region_basename,
-        "task isolated", fArg->getDecl()->getBaseName());
+        "task-isolated", fArg->getDecl()->getBaseName());
   }
 
   void emitFunctionArgumentApplyStronglyTransferred(SILLocation loc,

test/Concurrency/transfernonsendable.sil

@@ -108,7 +108,7 @@ bb0(%0 : $*{ var NonSendableKlass }):
 
   %f = function_ref @transferIndirect : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
   apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %f<NonSendableKlass>(%3) : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
-  // expected-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to global actor '<null>'-isolated context}}
+  // expected-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to global actor '<null>'-isolated context}}
   destroy_value %1 : ${ var NonSendableKlass }
 
   %9999 = tuple ()
@@ -282,7 +282,7 @@ bb0(%0 : @guaranteed $MyActor):
   %3 = class_method %0 : $MyActor, #MyActor.klass!getter : (isolated MyActor) -> () -> NonSendableKlass, $@convention(method) (@sil_isolated @guaranteed MyActor) -> @owned NonSendableKlass
   %4 = apply %3(%0) : $@convention(method) (@sil_isolated @guaranteed MyActor) -> @owned NonSendableKlass
   %5 = class_method %4 : $NonSendableKlass, #NonSendableKlass.asyncCall : (NonSendableKlass) -> () async -> (), $@convention(method) @async (@guaranteed NonSendableKlass) -> ()
-  %6 = apply [caller_isolation=nonisolated] [callee_isolation=actor_instance] %5(%4) : $@convention(method) @async (@guaranteed NonSendableKlass) -> () // expected-warning {{task isolated value of type 'NonSendableKlass' transferred to actor-isolated context; later accesses to value could race}}
+  %6 = apply [caller_isolation=nonisolated] [callee_isolation=actor_instance] %5(%4) : $@convention(method) @async (@guaranteed NonSendableKlass) -> () // expected-warning {{task-isolated value of type 'NonSendableKlass' transferred to actor-isolated context; later accesses to value could race}}
   destroy_value %4 : $NonSendableKlass
   hop_to_executor %0 : $MyActor
   %9 = tuple ()

test/Concurrency/transfernonsendable.swift

@@ -213,25 +213,25 @@ extension Actor {
     // expected-tns-note @-3 {{transferring actor-isolated 'closure' to main actor-isolated callee could cause races between main actor-isolated and actor-isolated uses}}
   }
 
-  // TODO: Why is this task isolated?
+  // TODO: Why is this task-isolated?
   func simpleClosureCaptureSelfAndTransferThroughTuple() async {
     let closure: () -> () = {
       print(self.klass)
     }
     let x = (1, closure)
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type '(Int, () -> ())' into main actor-isolated context may introduce data races}}
     // expected-complete-note @-1 {{a function type must be marked '@Sendable' to conform to 'Sendable'}}
-    // expected-tns-warning @-2 {{task isolated value of type '(Int, () -> ())' transferred to main actor-isolated context}}
+    // expected-tns-warning @-2 {{task-isolated value of type '(Int, () -> ())' transferred to main actor-isolated context}}
   }
 
-  // TODO: Why is this task isolated?
+  // TODO: Why is this task-isolated?
   func simpleClosureCaptureSelfAndTransferThroughTupleBackwards() async {
     let closure: () -> () = {
       print(self.klass)
     }
 
     let x = (closure, 1)
-    await transferToMain(x) // expected-tns-warning {{task isolated value of type '(() -> (), Int)' transferred to main actor-isolated context}}
+    await transferToMain(x) // expected-tns-warning {{task-isolated value of type '(() -> (), Int)' transferred to main actor-isolated context}}
     // expected-complete-warning @-1 {{passing argument of non-sendable type '(() -> (), Int)' into main actor-isolated context may introduce data races}}
     // expected-complete-note @-2 {{a function type must be marked '@Sendable' to conform to 'Sendable'}}
   }
@@ -1366,26 +1366,26 @@ actor ActorWithSetter {
   var recursive: ActorWithSetter? = nil
   var classBox = TwoFieldKlassClassBox()
 
-  // TODO: Why is this task isolated? This should be actor isolated?
+  // TODO: Why is this task-isolated? This should be actor isolated?
   func test1() async {
     let x = NonSendableKlass()
     self.field = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // expected-tns-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 
   func test2() async {
     let x = NonSendableKlass()
     self.twoFieldBox.k1 = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // expected-tns-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 
   func test3() async {
     let x = NonSendableKlass()
     self.twoFieldBoxInTuple.1.k1 = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}    
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // expected-tns-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 
   // This triggers a crash in SILGen with tns enabled.
@@ -1405,7 +1405,7 @@ actor ActorWithSetter {
     let x = NonSendableKlass()
     self.classBox.k1 = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // expected-tns-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 }
 
@@ -1420,21 +1420,21 @@ final actor FinalActorWithSetter {
     let x = NonSendableKlass()
     self.field = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // expected-tns-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 
   func test2() async {
     let x = NonSendableKlass()
     self.twoFieldBox.k1 = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // expected-tns-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 
   func test3() async {
     let x = NonSendableKlass()
     self.twoFieldBoxInTuple.1.k1 = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // expected-tns-warning @-1 {{task-isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
   }
 
   // This triggers a crash in SILGen with tns enabled.
@@ -1454,12 +1454,12 @@ final actor FinalActorWithSetter {
     let x = NonSendableKlass()
     self.classBox.k1 = x
     await transferToMain(x) // expected-complete-warning {{passing argument of non-sendable type 'NonSendableKlass' into main actor-isolated context may introduce data races}}
-    // expected-tns-warning @-1 {{task isolated value of type 'NonSendableKlass' transferred to main actor-isolated context}}
+    // 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}}
+    let _ = x // expected-tns-warning {{task-isolated value of type '() -> ()' transferred to main actor-isolated context}}
   }
 }

test/Concurrency/transfernonsendable_global_actor.swift

@@ -49,12 +49,12 @@ private class NonSendableLinkedListNode<T> { // expected-complete-note 3{{}}
   let x = firstList
 
   // TODO: This should say global actor isolated isolated.
-  await transferToMainActor(x) // expected-tns-warning {{task isolated value of type 'NonSendableLinkedList<Int>' transferred to main actor-isolated context}}
+  await transferToMainActor(x) // expected-tns-warning {{task-isolated value of type 'NonSendableLinkedList<Int>' transferred to main actor-isolated context}}
   // expected-complete-warning @-1 {{passing argument of non-sendable type 'NonSendableLinkedList<Int>' into main actor-isolated context may introduce data races}}
 
   let y = secondList.listHead!.next!
 
-  await transferToMainActor(y) // expected-tns-warning {{task isolated value of type 'NonSendableLinkedListNode<Int>' transferred to main actor-isolated context}}
+  await transferToMainActor(y) // expected-tns-warning {{task-isolated value of type 'NonSendableLinkedListNode<Int>' transferred to main actor-isolated context}}
   // expected-complete-warning @-1 {{passing argument of non-sendable type 'NonSendableLinkedListNode<Int>' into main actor-isolated context may introduce data races}}
 }
 
@@ -140,8 +140,8 @@ private struct StructContainingValue { // expected-complete-note 2{{}}
 
   x.1 = firstList
 
-  // TODO: This should be a global actor isolated error, not a task isolated error.
-  await transferToNonIsolated(x) // expected-tns-warning {{task isolated value of type '(NonSendableLinkedList<Int>, NonSendableLinkedList<Int>)' transferred to nonisolated context}}
+  // TODO: This should be a global actor isolated error, not a task-isolated error.
+  await transferToNonIsolated(x) // expected-tns-warning {{task-isolated value of type '(NonSendableLinkedList<Int>, NonSendableLinkedList<Int>)' transferred to nonisolated context}}
   // expected-complete-warning @-1 {{passing argument of non-sendable type '(NonSendableLinkedList<Int>, NonSendableLinkedList<Int>)' outside of global actor 'GlobalActor'-isolated context may introduce data races}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type '(NonSendableLinkedList<Int>, NonSendableLinkedList<Int>)' outside of global actor 'GlobalActor'-isolated context may introduce data races}}
 

test/Concurrency/transfernonsendable_globalactors.swift

@@ -40,16 +40,16 @@ struct CustomActor {
 
 @MainActor func testTransferGlobalActorGuardedValue() async {
   // TODO: Global actor error needed.
-  await transferToCustom(globalKlass) // expected-warning {{task isolated value of type 'Klass' transferred to global actor 'CustomActor'-isolated context}}
+  await transferToCustom(globalKlass) // expected-warning {{task-isolated value of type 'Klass' transferred to global actor 'CustomActor'-isolated context}}
 }
 
 @MainActor func testTransferGlobalActorGuardedValueWithlet() async {
   let x = globalKlass
-  await transferToCustom(x) // expected-warning {{task isolated value of type 'Klass' transferred to global actor 'CustomActor'-isolated context}}
+  await transferToCustom(x) // expected-warning {{task-isolated value of type 'Klass' transferred to global actor 'CustomActor'-isolated context}}
 }
 
 @MainActor func testTransferGlobalActorGuardedValueWithlet(_ k: Klass) async {
-  // expected-note @-1 {{value is task isolated since it is in the same region as 'k'}}
+  // expected-note @-1 {{value is task-isolated since it is in the same region as 'k'}}
   globalKlass = k
-  await transferToCustom(k) // expected-warning {{task isolated value of type 'Klass' transferred to global actor 'CustomActor'-isolated context; later accesses to value could race}}
+  await transferToCustom(k) // expected-warning {{task-isolated value of type 'Klass' transferred to global actor 'CustomActor'-isolated context; later accesses to value could race}}
 }