cleanup

Author: ktoso

include/swift/ABI/TaskStatus.h

@@ -45,7 +45,6 @@ class TaskStatusRecord {
   TaskStatusRecord(TaskStatusRecordKind kind,
                    TaskStatusRecord *parent = nullptr)
       : Flags(kind) {
-    getKind();
     resetParent(parent);
   }
 
@@ -175,10 +174,10 @@ 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),

stdlib/public/BackDeployConcurrency/CompatibilityOverrideConcurrency.def

@@ -241,10 +241,6 @@ OVERRIDE_TASK_GROUP(taskGroup_initialize, void,
                     SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
                     swift::, (TaskGroup *group, const Metadata *T), (group, T))
 
-OVERRIDE_TASK_GROUP(taskGroup_initializeWithFlags, void,
-                    SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
-                    swift::, (size_t flags, TaskGroup *group, const Metadata *T), (flags, group, T))
-
 OVERRIDE_TASK_STATUS(taskGroup_attachChild, void,
                     SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
                     swift::, (TaskGroup *group, AsyncTask *child),

stdlib/public/BackDeployConcurrency/TaskGroup.cpp

@@ -451,8 +451,8 @@ static TaskGroup *asAbstract(TaskGroupImpl *group) {
   return reinterpret_cast<TaskGroup*>(group);
 }
 
-TaskGroupTaskStatusRecord *TaskGroup::getTaskRecord() {
-  return asImpl(this)->getTaskRecord();
+TaskGroupTaskStatusRecord * TaskGroup::getTaskRecord() {
+    return asImpl(this)->getTaskRecord();
 }
 
 // =============================================================================
@@ -561,6 +561,7 @@ void TaskGroupImpl::offer(AsyncTask *completedTask, AsyncContext *context) {
   assert(completedTask->hasChildFragment());
   assert(completedTask->hasGroupChildFragment());
   assert(completedTask->groupChildFragment()->getGroup() == asAbstract(this));
+  SWIFT_TASK_DEBUG_LOG("offer task %p to group %p", completedTask, this);
 
   mutex.lock(); // TODO: remove fragment lock, and use status for synchronization
 
@@ -714,12 +715,12 @@ static void swift_taskGroup_wait_next_throwingImpl(
     SWIFT_TASK_DEBUG_LOG("poll group = %p, task = %p, ready task available = %p",
                          group, waitingTask, polled.retainedTask);
     fillGroupNextResult(context, polled);
-
     if (auto completedTask = polled.retainedTask) {
       // it would be null for PollStatus::Empty, then we don't need to release
       group->detachChild(polled.retainedTask);
       swift_release(polled.retainedTask);
     }
+
     return waitingTask->runInFullyEstablishedContext();
   }
 }
@@ -840,7 +841,6 @@ PollResult TaskGroupImpl::poll(AsyncTask *waitingTask) {
 
 // =============================================================================
 // ==== isEmpty ----------------------------------------------------------------
-
 SWIFT_CC(swift)
 static bool swift_taskGroup_isEmptyImpl(TaskGroup *group) {
   return asImpl(group)->isEmpty();

stdlib/public/BackDeployConcurrency/TaskGroup.swift

@@ -464,7 +464,6 @@ public struct ThrowingTaskGroup<ChildTaskResult: Sendable, Failure: Error> {
     }
   }
 
-  // TODO(ktoso): doesn't seem to be used?
   @usableFromInline
   internal mutating func _waitForAll() async throws {
     while let _ = try await next() { }

stdlib/public/BackDeployConcurrency/TaskStatus.h

@@ -170,7 +170,8 @@ class TaskGroupTaskStatusRecord : public TaskStatusRecord {
   TaskGroupTaskStatusRecord()
       : TaskStatusRecord(TaskStatusRecordKind::TaskGroup),
         FirstChild(nullptr),
-        LastChild(nullptr) {}
+        LastChild(nullptr) {
+  }
 
   TaskGroupTaskStatusRecord(AsyncTask *child)
       : TaskStatusRecord(TaskStatusRecordKind::TaskGroup),
@@ -179,9 +180,7 @@ 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

@@ -585,6 +585,10 @@ class AccumulatingTaskGroup: public TaskGroupBase {
     : TaskGroupBase(T, TaskGroupStatus::initial().status),
       readyQueue() {}
 
+  AccumulatingTaskGroup(const AccumulatingTaskGroup &) = delete;
+
+  virtual ~AccumulatingTaskGroup() {}
+
   virtual void destroy() override;
 
   virtual bool isDiscardingResults() const override {
@@ -699,6 +703,9 @@ class DiscardingTaskGroup: public TaskGroupBase {
     : TaskGroupBase(T, TaskGroupStatus::initial().status),
       readyQueue() {}
 
+  DiscardingTaskGroup(const DiscardingTaskGroup &) = delete;
+  virtual ~DiscardingTaskGroup() {}
+
   virtual void destroy() override;
 
   virtual bool isDiscardingResults() const override {