fix abi

Author: ktoso

include/swift/ABI/MetadataValues.h

@@ -2401,13 +2401,6 @@ class TaskGroupFlags : public FlagSet<uint32_t> {
                                 setIsDiscardResults)
 };
 
-/// Kinds of task group option records that can be passed to creating a task group.
-enum class TaskGroupOptionRecordKind : uint8_t {
-  /// Request that the task group immediately releases completed tasks,
-  /// and discard their results.
-  DiscardResults  = 0,
-};
-
 /// Flags for cancellation records.
 class TaskStatusRecordFlags : public FlagSet<size_t> {
 public:
@@ -2444,24 +2437,6 @@ class TaskOptionRecordFlags : public FlagSet<size_t> {
                                  getKind, setKind)
 };
 
-/// Flags for task group option records.
-class TaskGroupOptionRecordFlags : public FlagSet<size_t> {
-public:
-  enum {
-    Kind           = 0,
-    Kind_width     = 8,
-  };
-
-  explicit TaskGroupOptionRecordFlags(size_t bits) : FlagSet(bits) {}
-  constexpr TaskGroupOptionRecordFlags() {}
-  TaskGroupOptionRecordFlags(TaskGroupOptionRecordKind kind) {
-    setKind(kind);
-  }
-
-  FLAGSET_DEFINE_FIELD_ACCESSORS(Kind, Kind_width, TaskGroupOptionRecordKind,
-                                 getKind, setKind)
-};
-
 /// Flags passed to swift_continuation_init.
 class AsyncContinuationFlags : public FlagSet<size_t> {
 public:

stdlib/public/Concurrency/TaskGroup.swift

@@ -639,12 +639,17 @@ public struct ThrowingTaskGroup<ChildTaskResult: Sendable, Failure: Error> {
   @usableFromInline
   @available(*, deprecated, message: "Use `awaitAllRemainingTasksThrowing`, since 5.8 with discardResults draining may throw")
   internal mutating func awaitAllRemainingTasks() async {
-    // We discard the error because in old code, which may have inlined this `awaitAllRemainingTasks`
-    // method, draining was never going to throw
-    _ = try? await awaitAllRemainingTasksThrowing(childFailureCancelsGroup: false)
+    while true {
+      do {
+        guard let _ = try await next() else {
+          return
+        }
+      } catch {}
+    }
   }
 
   /// Await all the remaining tasks on this group.
+  @available(SwiftStdlib 5.8, *)
   @usableFromInline
   internal mutating func awaitAllRemainingTasksThrowing(childFailureCancelsGroup: Bool) async throws {
     /// Since 5.8, we implement "wait for all pending tasks to complete"
@@ -679,7 +684,11 @@ public struct ThrowingTaskGroup<ChildTaskResult: Sendable, Failure: Error> {
   /// - Throws: only during
   @_alwaysEmitIntoClient
   public mutating func waitForAll() async throws {
-    try await self.awaitAllRemainingTasksThrowing(childFailureCancelsGroup: false)
+    if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+      try await self.awaitAllRemainingTasksThrowing(childFailureCancelsGroup: false)
+    } else {
+      await self.awaitAllRemainingTasks()
+    }
   }
 
 #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY