cleanups of tests after merge

Author: ktoso

include/swift/ABI/Task.h

@@ -20,9 +20,9 @@
 #include "swift/Basic/RelativePointer.h"
 #include "swift/ABI/Executor.h"
 #include "swift/ABI/HeapObject.h"
+#include "swift/ABI/TaskGroup.h"
 #include "swift/ABI/Metadata.h"
 #include "swift/ABI/MetadataValues.h"
-#include "swift/Runtime/Concurrency.h"
 #include "swift/Runtime/Config.h"
 #include "swift/Basic/STLExtras.h"
 #include "bitset"
@@ -313,7 +313,7 @@ class AsyncTask : public HeapObject, public Job {
         assert(task);
         size_t amountToAllocate = TaskLocalItem::itemSize(valueType);
         // assert(amountToAllocate % MaximumAlignment == 0); // TODO: do we need this?
-        void *allocation = malloc(amountToAllocate); // TODO: use task-local allocator
+        void *allocation = malloc(amountToAllocate); // TODO: use task-local allocator rdar://74218679
         TaskLocalItem *item =
             new(allocation) TaskLocalItem(keyType, valueType);
 

include/swift/ABI/TaskGroup.h

@@ -21,6 +21,7 @@
 #include "swift/ABI/Executor.h"
 #include "swift/ABI/HeapObject.h"
 #include "swift/ABI/Metadata.h"
+#include "swift/ABI/TaskStatus.h"
 #include "swift/ABI/MetadataValues.h"
 #include "swift/Runtime/Config.h"
 #include "swift/Basic/STLExtras.h"

include/swift/Runtime/Concurrency.h

@@ -18,6 +18,7 @@
 #define SWIFT_RUNTIME_CONCURRENCY_H
 
 #include "swift/ABI/TaskStatus.h"
+#include "swift/ABI/TaskGroup.h"
 
 namespace swift {
 class DefaultActor;

stdlib/public/Concurrency/Task.swift

@@ -50,7 +50,7 @@ extension Task {
   /// All functions available on the Task
   // TODO: once we can have async properties land make this computed property
   public static func current() async -> Task {
-    Task.unsafeCurrent!.task // !-safe, we are guaranteed to have a task available within an async function
+    return Task.unsafeCurrent!.task // !-safe, we are guaranteed to have a task available within an async function
   }
 
 }

test/Concurrency/Runtime/async_task_cancellation_early.swift

@@ -17,12 +17,12 @@ func test_runDetached_cancel_child_early() async {
   let h: Task.Handle<Bool, Error> = Task.runDetached {
     async let childCancelled: Bool = { () -> Bool in
       sleep(2)
-      return await Task.__unsafeCurrentAsync().isCancelled
+      return Task.isCancelled
     }()
 
     let xx = await childCancelled
     print("child, cancelled: \(xx)") // CHECK: child, cancelled: true
-    let cancelled =  await Task.__unsafeCurrentAsync().isCancelled
+    let cancelled =  Task.isCancelled
     print("self, cancelled: \(cancelled )") // CHECK: self, cancelled: true
     return cancelled
   }

test/Concurrency/Runtime/async_task_cancellation_while_running.swift

@@ -16,12 +16,12 @@ func test_runDetached_cancel_while_child_running() async {
   let h: Task.Handle<Bool, Error> = Task.runDetached {
     async let childCancelled: Bool = { () -> Bool in
       sleep(3)
-      return await Task.__unsafeCurrentAsync().isCancelled
+      return Task.isCancelled
     }()
 
     let childWasCancelled = await childCancelled
     print("child, cancelled: \(childWasCancelled)") // CHECK: child, cancelled: true
-    let selfWasCancelled =  await Task.__unsafeCurrentAsync().isCancelled
+    let selfWasCancelled =  Task.isCancelled
     print("self, cancelled: \(selfWasCancelled )") // CHECK: self, cancelled: true
     return selfWasCancelled
   }

test/Concurrency/Runtime/async_taskgroup_cancelAll_only_specific_group.swift

@@ -24,7 +24,7 @@ func test_taskGroup_cancelAll_onlySpecificGroup() async {
     for i in 1...5 {
       await group.add {
         sleep(1)
-        let c = await Task.__unsafeCurrentAsync().isCancelled
+        let c = Task.isCancelled
         print("add: \(i) (cancelled: \(c))")
         return i
       }
@@ -36,7 +36,7 @@ func test_taskGroup_cancelAll_onlySpecificGroup() async {
       sum += got
     }
 
-    let c = await Task.__unsafeCurrentAsync().isCancelled
+    let c = Task.isCancelled
     print("g1 task cancelled: \(c)")
     let cc = group.isCancelled
     print("g1 group cancelled: \(cc)")
@@ -49,7 +49,7 @@ func test_taskGroup_cancelAll_onlySpecificGroup() async {
     for i in 1...3 {
       await group.add {
         sleep(1)
-        let c = await Task.__unsafeCurrentAsync().isCancelled
+        let c = Task.isCancelled
         print("g1 task \(i) (cancelled: \(c))")
         return i
       }
@@ -58,7 +58,7 @@ func test_taskGroup_cancelAll_onlySpecificGroup() async {
     print("cancelAll")
     group.cancelAll()
 
-    let c = await Task.__unsafeCurrentAsync().isCancelled
+    let c = Task.isCancelled
     print("g2 task cancelled: \(c)")
     let cc = group.isCancelled
     print("g2 group cancelled: \(cc)")

test/Concurrency/Runtime/async_taskgroup_cancel_parent_affects_group.swift

@@ -22,16 +22,16 @@ func test_taskGroup_cancel_parent_affects_group() async {
     try! await Task.withGroup(resultType: Int.self) { group -> Void in
       await group.add {
         sleep(3)
-        let c = await Task.__unsafeCurrentAsync().isCancelled
+        let c = Task.isCancelled
         print("group task isCancelled: \(c)")
         return 0
       }
 
       _ = try! await group.next()
-      let c = await Task.__unsafeCurrentAsync().isCancelled
+      let c = Task.isCancelled
       print("group isCancelled: \(c)")
     }
-    let c = await Task.__unsafeCurrentAsync().isCancelled
+    let c = Task.isCancelled
     print("detached task isCancelled: \(c)")
   }
 

test/Concurrency/Runtime/async_taskgroup_cancel_then_completions.swift

@@ -26,7 +26,7 @@ func test_taskGroup_cancel_then_completions() async {
       print("start first")
       sleep(1)
       print("done first")
-      return (1, await Task.__unsafeCurrentAsync().isCancelled)
+      return (1, Task.isCancelled)
     }
     print("added first: \(addedFirst)") // CHECK: added first: true
     assert(addedFirst)
@@ -35,7 +35,7 @@ func test_taskGroup_cancel_then_completions() async {
       print("start second")
       sleep(3)
       print("done second")
-      return (2, await Task.__unsafeCurrentAsync().isCancelled)
+      return (2, Task.isCancelled)
     }
     print("added second: \(addedSecond)") // CHECK: added second: true
     assert(addedSecond)

test/Concurrency/Runtime/async_taskgroup_next_not_invoked_cancelAll.swift

@@ -18,30 +18,30 @@ func test_skipCallingNext_butInvokeCancelAll() async {
   let result = try! await Task.withGroup(resultType: Int.self) { (group) async -> Int in
     for n in numbers {
       print("group.add { \(n) }")
-      await group.add { () async -> Int in
+      await group.add { [group] () async -> Int in
         sleep(2)
         print("  inside group.add { \(n) }")
-        let cancelled = Task.isCancelled
-        print("  inside group.add { \(n) } (canceled: \(cancelled))")
+        print("  inside group.add { \(n) } (group cancelled: \(group.isCancelled))")
+        print("  inside group.add { \(n) } (group child task cancelled: \(Task.isCancelled))")
         return n
       }
     }
 
     group.cancelAll()
 
     // return immediately; the group should wait on the tasks anyway
-    let c = Task.isCancelled
-    print("return immediately 0 (canceled: \(c))")
     print("return immediately 0 (group cancelled: \(group.isCancelled))")
+    print("return immediately 0 (task cancelled: \(Task.isCancelled))")
     return 0
   }
 
   // CHECK: group.add { 1 }
-  // CHECK: group.add { 1 }
-  // CHECK: return immediately 0 (task cancelled: false)
+  //
   // CHECK: return immediately 0 (group cancelled: true)
-  // CHECK: inside group.add { 1 } (task cancelled: true)
-  // CHECK: inside group.add { 1 } (task cancelled: true)
+  // CHECK: return immediately 0 (task cancelled: false)
+  //
+  // CHECK: inside group.add { 1 } (group cancelled: true)
+  // CHECK: inside group.add { 1 } (group child task cancelled: true)
 
   // CHECK: result: 0
   print("result: \(result)")