Merge pull request #82158 from swiftlang/tsan-release-fix

DanBlackwell · web-flow · commit 665515c78199 · 2025-06-12T08:26:49.000+01:00
[concurrency] Move tsan_release to point before task gets destroyed
diff --git a/stdlib/public/Concurrency/Actor.cpp b/stdlib/public/Concurrency/Actor.cpp
@@ -256,8 +256,6 @@ void swift::runJobInEstablishedExecutorContext(Job *job) {
 #if SWIFT_OBJC_INTEROP
   objc_autoreleasePoolPop(pool);
 #endif
-
-  _swift_tsan_release(job);
 }
 
 void swift::adoptTaskVoucher(AsyncTask *task) {
diff --git a/stdlib/public/Concurrency/TaskPrivate.h b/stdlib/public/Concurrency/TaskPrivate.h
@@ -854,6 +854,8 @@ struct AsyncTask::PrivateStorage {
       }
     }
 
+    _swift_tsan_release(task);
+
     // 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.

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,6 @@ void swift::runJobInEstablishedExecutorContext(Job *job) {`
`256`	`256`	`#if SWIFT_OBJC_INTEROP`
`257`	`257`	`objc_autoreleasePoolPop(pool);`
`258`	`258`	`#endif`
`259`		`-`
`260`		`- _swift_tsan_release(job);`
`261`	`259`	`}`
`262`	`260`
`263`	`261`	`void swift::adoptTaskVoucher(AsyncTask *task) {`
Original file line number	Diff line number	Diff line change
`@@ -854,6 +854,8 @@ struct AsyncTask::PrivateStorage {`
`854`	`854`	`}`
`855`	`855`	`}`
`856`	`856`
	`857`	`+ _swift_tsan_release(task);`
	`858`	`+`
`857`	`859`	`// Destroy and deallocate any remaining task local items since the task is`
`858`	`860`	`// completed. We need to do this before we destroy the task local`
`859`	`861`	`// deallocator.`