Merge pull request #20803 from alalek:core_parallel_workaround_tsan

4 years ago · b1a772d194
parent f11f2bfb56 62414e3073
commit b1a772d194
1 changed files with 5 additions and 0 deletions
--- a/modules/core/src/parallel_impl.cpp
+++ b/modules/core/src/parallel_impl.cpp
@ -615,6 +615,11 @@ void ThreadPool::run(const Range& range, const ParallelLoopBody& body, double ns
            {
                WorkerThread& thread = *(threads[i].get());
                if (
+#if defined(__clang__) && defined(__has_feature)
+#if __has_feature(thread_sanitizer)
+                        1 ||  // Robust workaround to avoid data race warning of `thread.job`
+#endif
+#endif
 #if !defined(CV_USE_GLOBAL_WORKERS_COND_VAR)
                        thread.isActive ||
 #endif