Adopt @Concurrent in Task APIs

Author: DougGregor

stdlib/public/Concurrency/Task.swift

@@ -262,7 +262,7 @@ extension Task {
   ///     throw the error the operation has thrown when awaited on.
   public static func runDetached<T>(
     priority: Priority = .default,
-    operation: @escaping () async throws -> T
+    operation: @concurrent @escaping () async throws -> T
   ) -> Handle<T> {
     // Set up the job flags for a new task.
     var flags = JobFlags()
@@ -281,7 +281,7 @@ extension Task {
 
 }
 
-public func _runAsyncHandler(operation: @escaping () async -> ()) {
+public func _runAsyncHandler(operation: @concurrent @escaping () async -> ()) {
   _ = Task.runDetached(operation: operation)
 }
 
@@ -368,7 +368,7 @@ public func _taskFutureGetThrowing<T>(
 }
 
 public func _runChildTask<T>(
-  operation: @escaping () async throws -> T
+  operation: @concurrent @escaping () async throws -> T
 ) async -> Builtin.NativeObject {
   let currentTask = Builtin.getCurrentAsyncTask()
 
@@ -391,7 +391,7 @@ public func _runChildTask<T>(
 
 public func _runGroupChildTask<T>(
   overridingPriority priorityOverride: Task.Priority? = nil,
-  operation: @escaping () async throws -> T
+  operation: @concurrent @escaping () async throws -> T
 ) async -> Builtin.NativeObject {
   let currentTask = Builtin.getCurrentAsyncTask()
 

stdlib/public/Concurrency/TaskGroup.swift

@@ -63,7 +63,7 @@ extension Task {
   public static func withGroup<TaskResult, BodyResult>(
     resultType: TaskResult.Type,
     returning returnType: BodyResult.Type = BodyResult.self,
-    body: @escaping ((inout Task.Group<TaskResult>) async throws -> BodyResult)
+    body: @concurrent @escaping (inout Task.Group<TaskResult>) async throws -> BodyResult
   ) async throws -> BodyResult {
     let parent = Builtin.getCurrentAsyncTask()
 
@@ -134,7 +134,7 @@ extension Task {
     @discardableResult
     public mutating func add(
       overridingPriority priorityOverride: Priority? = nil,
-      operation: @escaping () async throws -> TaskResult
+      operation: @concurrent @escaping () async throws -> TaskResult
     ) async -> Task.Handle<TaskResult> {
       // Increment the number of pending tasks immediately;
       // We don't need to know which specific task is pending, just that pending

test/Concurrency/Runtime/mainactor.swift

@@ -74,7 +74,7 @@ actor class A {
   exitTest(success: ok)
 }
 
-func someFunc() async {
+@concurrent func someFunc() async {
   guard checkIfMainQueue(expectedAnswer: false) else {
     print("ERROR: did not expect detatched task to run on main queue!")
     exit(EXIT_FAILURE)

test/SILGen/async_handler.swift

@@ -8,7 +8,7 @@ func take<T>(_ t: T) async {
 // CHECK-LABEL: sil [ossa] @$s4test13simpleHandleryySiF : $@convention(thin) (Int) -> () {
 // CHECK:   [[BODYFN:%[0-9]+]] = function_ref @$s4test13simpleHandleryySiYF : $@convention(thin) @async (Int) -> ()
 // CHECK:   [[FN:%[0-9]+]] = partial_apply [callee_guaranteed] [[BODYFN]](%0) : $@convention(thin) @async (Int) -> ()
-// CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
+// CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYJc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
 // CHECK:   {{.*}} = apply [[INTRINSIC]]([[FN]]) : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
 // CHECK:   destroy_value [[FN]] : $@async @callee_guaranteed () -> ()
 // CHECK: } // end sil function '$s4test13simpleHandleryySiF'
@@ -21,7 +21,7 @@ public func simpleHandler(_ i: Int) {
 // CHECK:   [[COPY:%[0-9]+]] = copy_value %0 : $String
 // CHECK:   [[BODYFN:%[0-9]+]] = function_ref @$s4test20nonTrivialArgHandleryySSYF : $@convention(thin) @async (@guaranteed String) -> ()
 // CHECK:   [[FN:%[0-9]+]] = partial_apply [callee_guaranteed] [[BODYFN]]([[COPY]]) : $@convention(thin) @async (@guaranteed String) -> ()
-// CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
+// CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYJc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
 // CHECK:   {{.*}} = apply [[INTRINSIC]]([[FN]]) : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
 // CHECK:   destroy_value [[FN]] : $@async @callee_guaranteed () -> ()
 // CHECK: } // end sil function '$s4test20nonTrivialArgHandleryySSF'
@@ -35,7 +35,7 @@ public func nonTrivialArgHandler(_ s: String) {
 // CHECK:   copy_addr %0 to [initialization] [[TMP]] : $*T
 // CHECK:   [[BODYFN:%[0-9]+]] = function_ref @$s4test14genericHandleryyxYlF : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
 // CHECK:   [[FN:%[0-9]+]] = partial_apply [callee_guaranteed] [[BODYFN]]<T>([[TMP]]) : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
-// CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
+// CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYJc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
 // CHECK:   {{.*}} = apply [[INTRINSIC]]([[FN]]) : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
 // CHECK:   destroy_value [[FN]] : $@async @callee_guaranteed () -> ()
 // CHECK: } // end sil function '$s4test14genericHandleryyxlF'
@@ -48,7 +48,7 @@ public struct Mystruct {
   // CHECK-LABEL: sil [ossa] @$s4test8MystructV13memberHandleryySiF : $@convention(method) (Int, Mystruct) -> () {
   // CHECK:   [[BODYFN:%[0-9]+]] = function_ref @$s4test8MystructV13memberHandleryySiYF : $@convention(method) @async (Int, Mystruct) -> ()
   // CHECK:   [[FN:%[0-9]+]] = partial_apply [callee_guaranteed] [[BODYFN]](%0, %1) : $@convention(method) @async (Int, Mystruct) -> ()
-  // CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
+  // CHECK:   [[INTRINSIC:%[0-9]+]] = function_ref @$s12_Concurrency16_runAsyncHandler9operationyyyYJc_tF : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
   // CHECK:   {{.*}} = apply [[INTRINSIC]]([[FN]]) : $@convention(thin) (@guaranteed @async @callee_guaranteed () -> ()) -> ()
   // CHECK:   destroy_value [[FN]] : $@async @callee_guaranteed () -> ()
   // CHECK: } // end sil function '$s4test8MystructV13memberHandleryySiF'

test/SILGen/async_let.swift

@@ -21,7 +21,7 @@ func testAsyncLetInt() async -> Int {
   // CHECK: [[REABSTRACT_THUNK:%.*]] = function_ref @$sSiIegHd_Sis5Error_pIegHrzo_TR : $@convention(thin) @async (@guaranteed @async @callee_guaranteed () -> Int) -> (@out Int, @error Error)
   // CHECK: [[REABSTRACT_CLOSURE:%.*]] = partial_apply [callee_guaranteed] [[REABSTRACT_THUNK]]([[THICK_CLOSURE]]) : $@convention(thin) @async (@guaranteed @async @callee_guaranteed () -> Int) -> (@out Int, @error Error)
   // CHECK: [[CLOSURE_ARG:%.*]] = convert_function [[REABSTRACT_CLOSURE]] : $@async @callee_guaranteed () -> (@out Int, @error Error) to $@async @callee_guaranteed @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <Int>
-  // CHECK: [[RUN_CHILD_TASK:%.*]] = function_ref @$s12_Concurrency13_runChildTask9operationBoxyYKc_tYlF : $@convention(thin) @async <τ_0_0> (@guaranteed @async @callee_guaranteed @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <τ_0_0>) -> @owned Builtin.NativeObject
+  // CHECK: [[RUN_CHILD_TASK:%.*]] = function_ref @$s12_Concurrency13_runChildTask9operationBoxyYJKc_tYlF : $@convention(thin) @async <τ_0_0> (@guaranteed @async @callee_guaranteed @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <τ_0_0>) -> @owned Builtin.NativeObject
   // CHECK: [[CHILD_TASK:%.*]] = apply [[RUN_CHILD_TASK]]<Int>([[CLOSURE_ARG]]) : $@convention(thin) @async <τ_0_0> (@guaranteed @async @callee_guaranteed @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <τ_0_0>) -> @owned Builtin.NativeObject
   async let i = await getInt()