fix cast type in getting task record

Author: ktoso

stdlib/public/Concurrency/TaskGroup.cpp

@@ -50,7 +50,7 @@
 
 using namespace swift;
 
-#if 1
+#if 0
 #define SWIFT_TASK_GROUP_DEBUG_LOG(group, fmt, ...) \
 fprintf(stderr, "[%#lx] [%s:%d](%s) group(%p%s) " fmt "\n",             \
       (unsigned long)Thread::current().platformThreadId(),              \
@@ -259,7 +259,7 @@ class TaskGroupBase : public TaskGroupTaskStatusRecord {
   /// Any TaskGroup always IS its own TaskRecord.
   /// This allows us to easily get the group while cancellation is propagated throughout the task tree.
   TaskGroupTaskStatusRecord *getTaskRecord() {
-    return reinterpret_cast<TaskGroupTaskStatusRecord *>(this);
+    return static_cast<TaskGroupTaskStatusRecord *>(this);
   }
 
   // ==== Queue operations ----------------------------------------------------
@@ -875,6 +875,8 @@ static void swift_taskGroup_initializeWithFlagsImpl(size_t rawGroupFlags,
   }
 
   TaskGroupTaskStatusRecord *record = impl->getTaskRecord();
+  assert(record->getKind() == swift::TaskStatusRecordKind::TaskGroup);
+
   // ok, now that the group actually is initialized: attach it to the task
   addStatusRecord(record, [&](ActiveTaskStatus parentStatus) {
     // If the task has already been cancelled, reflect that immediately in

stdlib/public/Concurrency/TaskStatus.cpp

@@ -330,6 +330,7 @@ static bool swift_task_hasTaskGroupStatusRecordImpl() {
                        [&](ActiveTaskStatus &status) {
     // Scan for the task group record within all the active records.
     for (auto record: status.records()) {
+      fprintf(stderr, "[%s:%d](%s) CHECKING record = %d\n", __FILE_NAME__, __LINE__, __FUNCTION__, record->getKind());
       if (record->getKind() == TaskStatusRecordKind::TaskGroup) {
         foundTaskGroupRecord = true;
         return;

test/Concurrency/Runtime/async_task_locals_prevent_illegal_use_discarding_taskgroup.swift

@@ -22,23 +22,7 @@ enum TL {
 func bindAroundGroupAddTask() async {
   await TL.$number.withValue(1111) { // ok
     await withTaskGroup(of: Int.self) { group in
-      // CHECK: error: task-local: detected illegal task-local value binding at {{.*}}illegal_use.swift:[[# @LINE + 1]]
-      TL.$number.withValue(2222) { // bad!
-        print("Survived, inside withValue!") // CHECK-NOT: Survived, inside withValue!
-        group.addTask {
-          0 // don't actually perform the read, it would be unsafe.
-        }
-      }
-
-      print("Survived the illegal call!") // CHECK-NOT: Survived the illegal call!
-    }
-  }
-}
-
-func bindAroundDiscardingGroupAddTask() async {
-  await TL.$number.withValue(1111) { // ok
-    await withDiscardingTaskGroup(of: Int.self) { group in
-      // CHECK: error: task-local: detected illegal task-local value binding at {{.*}}illegal_use.swift:[[# @LINE + 1]]
+      // CHECK: error: task-local: detected illegal task-local value binding at {{.*}}illegal_use_discarding_taskgroup.swift:[[# @LINE + 1]]
       TL.$number.withValue(2222) { // bad!
         print("Survived, inside withValue!") // CHECK-NOT: Survived, inside withValue!
         group.addTask {
@@ -53,10 +37,6 @@ func bindAroundDiscardingGroupAddTask() async {
 
 @main struct Main {
   static func main() async {
-    if CommandLine.arguments.contains("discarding-task-group") {
-      await bindAroundGroupAddTask()
-    } else {
-      await bindAroundDiscardingGroupAddTask()
-    }
+    await bindAroundGroupAddTask()
   }
 }

test/Concurrency/Runtime/async_task_locals_prevent_illegal_use_taskgroup.swift

@@ -11,34 +11,17 @@
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
 
-@available(SwiftStdlib 5.1, *)
 enum TL {
   @TaskLocal
   static var number: Int = 2
 }
 
 // ==== ------------------------------------------------------------------------
 
-func bindAroundGroupAddTask() async {
-  await TL.$number.withValue(1111) { // ok
-    await withTaskGroup(of: Int.self) { group in
-      // CHECK: error: task-local: detected illegal task-local value binding at {{.*}}illegal_use.swift:[[# @LINE + 1]]
-      TL.$number.withValue(2222) { // bad!
-        print("Survived, inside withValue!") // CHECK-NOT: Survived, inside withValue!
-        group.addTask {
-          0 // don't actually perform the read, it would be unsafe.
-        }
-      }
-
-      print("Survived the illegal call!") // CHECK-NOT: Survived the illegal call!
-    }
-  }
-}
-
 func bindAroundDiscardingGroupAddTask() async {
   await TL.$number.withValue(1111) { // ok
-    await withDiscardingTaskGroup(of: Int.self) { group in
-      // CHECK: error: task-local: detected illegal task-local value binding at {{.*}}illegal_use.swift:[[# @LINE + 1]]
+    await withTaskGroup(of: Int.self) { group in
+      // CHECK: error: task-local: detected illegal task-local value binding at {{.*}}illegal_use_taskgroup.swift:[[# @LINE + 1]]
       TL.$number.withValue(2222) { // bad!
         print("Survived, inside withValue!") // CHECK-NOT: Survived, inside withValue!
         group.addTask {
@@ -53,10 +36,6 @@ func bindAroundDiscardingGroupAddTask() async {
 
 @main struct Main {
   static func main() async {
-    if CommandLine.arguments.contains("discarding-task-group") {
-      await bindAroundGroupAddTask()
-    } else {
-      await bindAroundDiscardingGroupAddTask()
-    }
+    await bindAroundDiscardingGroupAddTask()
   }
 }