fix cast type in getting task record

Author: ktoso

include/swift/ABI/TaskStatus.h

@@ -45,13 +45,16 @@ class TaskStatusRecord {
   TaskStatusRecord(TaskStatusRecordKind kind,
                    TaskStatusRecord *parent = nullptr)
       : Flags(kind) {
+    getKind();
     resetParent(parent);
   }
 
   TaskStatusRecord(const TaskStatusRecord &) = delete;
   TaskStatusRecord &operator=(const TaskStatusRecord &) = delete;
 
-  TaskStatusRecordKind getKind() const { return Flags.getKind(); }
+  TaskStatusRecordKind getKind() const {
+    return Flags.getKind();
+  }
 
   TaskStatusRecord *getParent() const { return Parent; }
 
@@ -172,15 +175,14 @@ class ChildTaskStatusRecord : public TaskStatusRecord {
 /// Group child tasks DO NOT have their own `ChildTaskStatusRecord` entries,
 /// and are only tracked by their respective `TaskGroupTaskStatusRecord`.
 class TaskGroupTaskStatusRecord : public TaskStatusRecord {
+public:
   AsyncTask *FirstChild;
   AsyncTask *LastChild;
 
-public:
   TaskGroupTaskStatusRecord()
       : TaskStatusRecord(TaskStatusRecordKind::TaskGroup),
         FirstChild(nullptr),
-        LastChild(nullptr) {
-  }
+        LastChild(nullptr) {}
 
   TaskGroupTaskStatusRecord(AsyncTask *child)
       : TaskStatusRecord(TaskStatusRecordKind::TaskGroup),
@@ -189,7 +191,8 @@ class TaskGroupTaskStatusRecord : public TaskStatusRecord {
     assert(!LastChild || !LastChild->childFragment()->getNextChild());
   }
 
-  TaskGroup *getGroup() { return reinterpret_cast<TaskGroup *>(this); }
+  /// Get the task group this record is associated with.
+  TaskGroup *getGroup();
 
   /// Return the first child linked by this record.  This may be null;
   /// if not, it (and all of its successors) are guaranteed to satisfy

stdlib/public/BackDeployConcurrency/TaskStatus.h

@@ -170,8 +170,7 @@ class TaskGroupTaskStatusRecord : public TaskStatusRecord {
   TaskGroupTaskStatusRecord()
       : TaskStatusRecord(TaskStatusRecordKind::TaskGroup),
         FirstChild(nullptr),
-        LastChild(nullptr) {
-  }
+        LastChild(nullptr) {}
 
   TaskGroupTaskStatusRecord(AsyncTask *child)
       : TaskStatusRecord(TaskStatusRecordKind::TaskGroup),
@@ -180,7 +179,9 @@ class TaskGroupTaskStatusRecord : public TaskStatusRecord {
     assert(!LastChild || !LastChild->childFragment()->getNextChild());
   }
 
-  TaskGroup *getGroup() { return reinterpret_cast<TaskGroup *>(this); }
+  TaskGroup *getGroup() {
+    return reinterpret_cast<TaskGroup *>(this);
+  }
 
   /// Return the first child linked by this record.  This may be null;
   /// if not, it (and all of its successors) are guaranteed to satisfy

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(),              \
@@ -67,8 +67,8 @@ namespace {
 class TaskStatusRecord;
 struct TaskGroupStatus;
 
-struct AccumulatingTaskGroup;
-struct DiscardingTaskGroup;
+class AccumulatingTaskGroup;
+class DiscardingTaskGroup;
 
 /******************************************************************************/
 /*************************** TASK GROUP BASE **********************************/
@@ -112,9 +112,15 @@ class TaskGroupBase : public TaskGroupTaskStatusRecord {
       waitQueue(nullptr),
       successType(T) {}
 
+  TaskGroupBase(const TaskGroupBase &) = delete;
+
 public:
   virtual ~TaskGroupBase() {}
 
+  TaskStatusRecordKind getKind() const {
+    return Flags.getKind();
+  }
+
   /// Describes the status of the group.
   enum class ReadyStatus : uintptr_t {
     /// The task group is empty, no tasks are pending.
@@ -259,7 +265,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 ----------------------------------------------------
@@ -824,11 +830,11 @@ static TaskGroupBase *asBaseImpl(TaskGroup *group) {
 }
 static AccumulatingTaskGroup *asAccumulatingImpl(TaskGroup *group) {
   assert(group->isAccumulatingResults());
-  return reinterpret_cast<AccumulatingTaskGroup*>(group);
+  return static_cast<AccumulatingTaskGroup*>(reinterpret_cast<TaskGroupBase*>(group));
 }
 static DiscardingTaskGroup *asDiscardingImpl(TaskGroup *group) {
   assert(group->isDiscardingResults());
-  return reinterpret_cast<DiscardingTaskGroup*>(group);
+  return static_cast<DiscardingTaskGroup*>(reinterpret_cast<TaskGroupBase*>(group));
 }
 
 static TaskGroup *asAbstract(TaskGroupBase *group) {
@@ -849,6 +855,10 @@ bool TaskGroup::isDiscardingResults() {
   return asBaseImpl(this)->isDiscardingResults();
 }
 
+TaskGroup* TaskGroupTaskStatusRecord::getGroup() {
+  return reinterpret_cast<TaskGroup *>(static_cast<TaskGroupBase*>(this));
+}
+
 // =============================================================================
 // ==== initialize -------------------------------------------------------------
 
@@ -864,7 +874,7 @@ static void swift_taskGroup_initializeWithFlagsImpl(size_t rawGroupFlags,
                                                     TaskGroup *group, const Metadata *T) {
 
   TaskGroupFlags groupFlags(rawGroupFlags);
-  SWIFT_TASK_DEBUG_LOG("(group(%p) create; flags: isDiscardingResults=%d",
+  SWIFT_TASK_DEBUG_LOG("group(%p) create; flags: isDiscardingResults=%d",
                        group, groupFlags.isDiscardResults());
 
   TaskGroupBase *impl;
@@ -875,6 +885,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
@@ -902,7 +914,8 @@ void TaskGroup::addChildTask(AsyncTask *child) {
   // prevents us from racing with cancellation or escalation.  We don't
   // need to acquire the task group lock because the child list is only
   // accessed under the task status record lock.
-  auto record = asBaseImpl(this)->getTaskRecord();
+  auto base = asBaseImpl(this);
+  auto record = base->getTaskRecord();
   record->attachChild(child);
 }
 

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()
   }
 }