averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Concurrency] Cancelled group should only spawn already cancelled tasks

Browse Source
This commit is contained in:
Konrad `ktoso` Malawski
2021-06-24 08:28:05 +09:00
parent 11e3a652df
commit dd10132b12
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stdlib/public/Concurrency/Task.cpp
View File

@@ -565,7 +565,8 @@ static AsyncTaskAndContext swift_task_create_group_future_commonImpl(
// In a task group we would not have allowed the `add` to create a child anymore,
// however better safe than sorry and `async let` are not expressed as task groups,
// so they may have been spawned in any case still.
if (swift_task_isCancelled(parent))
if (swift_task_isCancelled(parent) ||
(group && group->isCancelled()))
swift_task_cancel(task);
// Initialize task locals with a link to the parent task.