DiscardingTaskGroup now shares some implementation with "Accumulating" TaskGroup

Author: ktoso

include/swift/ABI/TaskGroup.h

@@ -54,6 +54,14 @@ class alignas(Alignment_TaskGroup) TaskGroup {
 
   // Provide accessor for task group's status record
   TaskGroupTaskStatusRecord *getTaskRecord();
+
+  /// The group is a `TaskGroup` that accumulates results.
+  bool isAccumulatingResults() {
+    return !isDiscardingResults();
+  }
+
+  /// The group is a `DiscardingTaskGroup` that discards results.
+  bool isDiscardingResults();
 };
 
 } // end namespace swift

include/swift/Runtime/Concurrency.h

@@ -289,16 +289,6 @@ void swift_taskGroup_cancelAll(TaskGroup *group);
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 bool swift_taskGroup_isCancelled(TaskGroup *group);
 
-/// Check if the task group is discarding results or not.
-///
-/// This can be called from any thread. Its Swift signature is
-///
-/// \code
-/// func swift_taskGroup_isDiscardingResults(group: Builtin.RawPointer)
-/// \endcode
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-bool swift_taskGroup_isDiscardingResults(TaskGroup *group);
-
 /// Wait until all pending tasks from the task group have completed.
 /// If this task group is accumulating results, this also discards all those results.
 ///

stdlib/public/BackDeployConcurrency/CompatibilityOverrideConcurrency.def

@@ -273,10 +273,6 @@ OVERRIDE_TASK_GROUP(taskGroup_isCancelled, bool,
                     SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
                     swift::, (TaskGroup *group), (group))
 
-OVERRIDE_TASK_GROUP(taskGroup_isDiscardingResults, bool,
-                    SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
-                    swift::, (TaskGroup *group), (group))
-
 OVERRIDE_TASK_GROUP(taskGroup_wait_all, void,
                     SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swiftasync),
                     swift::,

stdlib/public/BackDeployConcurrency/TaskGroup.cpp

@@ -465,8 +465,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();
 }
 
 // =============================================================================

stdlib/public/CompatibilityOverride/CompatibilityOverrideConcurrency.def

@@ -307,10 +307,6 @@ OVERRIDE_TASK_GROUP(taskGroup_isCancelled, bool,
                     SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
                     swift::, (TaskGroup *group), (group))
 
-OVERRIDE_TASK_GROUP(taskGroup_isDiscardingResults, bool,
-                    SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
-                    swift::, (TaskGroup *group), (group))
-
 OVERRIDE_TASK_GROUP(taskGroup_cancelAll, void,
                     SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
                     swift::, (TaskGroup *group), (group))

stdlib/public/Concurrency/DiscardingTaskGroup.swift

@@ -552,7 +552,3 @@ func _taskGroupWaitAll<T>(
     group: Builtin.RawPointer,
     bodyError: Error?
 ) async throws -> T?
-
-@available(SwiftStdlib 5.8, *) // FIXME: remove
-@_silgen_name("swift_taskGroup_isDiscardingResults")
-func _taskGroupIsDiscardingResults(group: Builtin.RawPointer) -> Bool