Skip to content

Commit 04610bd

Browse files
committed
unlock async_taskgroup_void_neverConsumingTasks again rdar://104332560
1 parent 32b2c4b commit 04610bd

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

stdlib/public/Concurrency/TaskGroup.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,6 @@ class AccumulatingTaskGroup: public TaskGroupBase {
721721

722722
virtual void destroy() override;
723723

724-
virtual ~AccumulatingTaskGroup() {}
725-
726724
virtual bool isDiscardingResults() const override {
727725
return false;
728726
}
@@ -771,8 +769,6 @@ class DiscardingTaskGroup: public TaskGroupBase {
771769

772770
virtual void destroy() override;
773771

774-
virtual ~DiscardingTaskGroup() {}
775-
776772
virtual bool isDiscardingResults() const override {
777773
return true;
778774
}

test/Concurrency/Runtime/async_taskgroup_void_neverConsumingTasks.swift renamed to test/Concurrency/Runtime/async_taskgroup_discarding_neverConsumingTasks.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// REQUIRES: concurrency
44
// REQUIRES: concurrency_runtime
55

6-
// REQUIRES: rdar104332560
7-
86
// UNSUPPORTED: back_deployment_runtime
97
// UNSUPPORTED: OS=linux-gnu
108

@@ -39,7 +37,7 @@ actor Waiter {
3937
}
4038
}
4139

42-
func test_taskGroup_void_neverConsume() async {
40+
func test_discardingTaskGroup_neverConsume() async {
4341
print(">>> \(#function)")
4442
let until = 100
4543
let waiter = Waiter(until: until)
@@ -60,7 +58,7 @@ func test_taskGroup_void_neverConsume() async {
6058
print("all tasks: \(allTasks)")
6159
}
6260

63-
func test_taskGroup_void_neverConsume(sleepBeforeGroupWaitAll: Duration) async {
61+
func test_discardingTaskGroup_neverConsume(sleepBeforeGroupWaitAll: Duration) async {
6462
print(">>> \(#function)")
6563
let until = 100
6664
let waiter = Waiter(until: until)
@@ -86,7 +84,7 @@ func test_taskGroup_void_neverConsume(sleepBeforeGroupWaitAll: Duration) async {
8684

8785
@main struct Main {
8886
static func main() async {
89-
await test_taskGroup_void_neverConsume()
90-
await test_taskGroup_void_neverConsume(sleepBeforeGroupWaitAll: .milliseconds(500))
87+
await test_discardingTaskGroup_neverConsume()
88+
await test_discardingTaskGroup_neverConsume(sleepBeforeGroupWaitAll: .milliseconds(500))
9189
}
9290
}

0 commit comments

Comments
 (0)