================ @@ -27,7 +29,7 @@ int CndVar::wait(Mutex *m) { CndWaiter waiter; { - MutexLock ml(&qmtx); + cpp::lock_guard ml(qmtx); ---------------- nickdesaulniers wrote: oops, did I undo this when I recently moved CndVar? https://github.com/llvm/llvm-project/pull/92168