Skip to content

Commit c9329db

Browse files
authored
Merge pull request #81814 from mikeash/taskgroup-fixes
[Concurrency] Fix races/overflows in TaskGroup implementation.
2 parents 9753d23 + 5be22fa commit c9329db

File tree

4 files changed

+195
-107
lines changed

4 files changed

+195
-107
lines changed

stdlib/public/Concurrency/DiscardingTaskGroup.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public func withDiscardingTaskGroup<GroupResult>(
8080
discardResults: true
8181
)
8282

83-
let _group = Builtin.createTaskGroupWithFlags(flags, GroupResult.self)
83+
let _group = Builtin.createTaskGroupWithFlags(flags, Void.self)
8484
var group = DiscardingTaskGroup(group: _group)
8585
defer { Builtin.destroyTaskGroup(_group) }
8686

@@ -108,7 +108,7 @@ public func _unsafeInheritExecutor_withDiscardingTaskGroup<GroupResult>(
108108
discardResults: true
109109
)
110110

111-
let _group = Builtin.createTaskGroupWithFlags(flags, GroupResult.self)
111+
let _group = Builtin.createTaskGroupWithFlags(flags, Void.self)
112112
var group = DiscardingTaskGroup(group: _group)
113113
defer { Builtin.destroyTaskGroup(_group) }
114114

@@ -347,7 +347,7 @@ public func withThrowingDiscardingTaskGroup<GroupResult>(
347347
discardResults: true
348348
)
349349

350-
let _group = Builtin.createTaskGroupWithFlags(flags, GroupResult.self)
350+
let _group = Builtin.createTaskGroupWithFlags(flags, Void.self)
351351
var group = ThrowingDiscardingTaskGroup<Error>(group: _group)
352352
defer { Builtin.destroyTaskGroup(_group) }
353353

@@ -378,7 +378,7 @@ public func _unsafeInheritExecutor_withThrowingDiscardingTaskGroup<GroupResult>(
378378
discardResults: true
379379
)
380380

381-
let _group = Builtin.createTaskGroupWithFlags(flags, GroupResult.self)
381+
let _group = Builtin.createTaskGroupWithFlags(flags, Void.self)
382382
var group = ThrowingDiscardingTaskGroup<Error>(group: _group)
383383
defer { Builtin.destroyTaskGroup(_group) }
384384

0 commit comments

Comments
 (0)