diff options
Diffstat (limited to 'contrib/llvm/lib/Support/ThreadPool.cpp')
| -rw-r--r-- | contrib/llvm/lib/Support/ThreadPool.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/llvm/lib/Support/ThreadPool.cpp b/contrib/llvm/lib/Support/ThreadPool.cpp index d4dcb2e..db03a4d 100644 --- a/contrib/llvm/lib/Support/ThreadPool.cpp +++ b/contrib/llvm/lib/Support/ThreadPool.cpp @@ -75,8 +75,11 @@ ThreadPool::ThreadPool(unsigned ThreadCount) void ThreadPool::wait() { // Wait for all threads to complete and the queue to be empty std::unique_lock<std::mutex> LockGuard(CompletionLock); + // The order of the checks for ActiveThreads and Tasks.empty() matters because + // any active threads might be modifying the Tasks queue, and this would be a + // race. CompletionCondition.wait(LockGuard, - [&] { return Tasks.empty() && !ActiveThreads; }); + [&] { return !ActiveThreads && Tasks.empty(); }); } std::shared_future<ThreadPool::VoidTy> ThreadPool::asyncImpl(TaskTy Task) { |
