Skip to content

[6.2][Concurrency] Move tsan_release to point before task gets destroyed #82719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[6.2][Concurrency] Move tsan_release to point before task gets destroyed #82719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions stdlib/public/Concurrency/Actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,6 @@ void swift::runJobInEstablishedExecutorContext(Job *job) {
#if SWIFT_OBJC_INTEROP
objc_autoreleasePoolPop(pool);
#endif

_swift_tsan_release(job);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This operates on every kind of job, including async tasks...

}

void swift::adoptTaskVoucher(AsyncTask *task) {
Expand Down
2 changes: 2 additions & 0 deletions stdlib/public/Concurrency/TaskPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,8 @@ struct AsyncTask::PrivateStorage {
}
}

_swift_tsan_release(task);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only applies to async tasks.


// Destroy and deallocate any remaining task local items since the task is
// completed. We need to do this before we destroy the task local
// deallocator.
Expand Down