From 5c43abcf2df2276f7fe714998190fdb3a8696d44 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Tue, 4 Dec 2018 04:07:43 +0000 Subject: [PATCH] [compiler-rt] Use the new zx_futex_wait for Fuchsia sanitizer runtime This finishes the soft-transition to the new primitive that implements priority inheritance. Differential Revision: https://reviews.llvm.org/D55244 llvm-svn: 348236 --- compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc b/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc index ee451f9..0698666 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc @@ -120,8 +120,9 @@ void BlockingMutex::Lock() { if (atomic_exchange(m, MtxLocked, memory_order_acquire) == MtxUnlocked) return; while (atomic_exchange(m, MtxSleeping, memory_order_acquire) != MtxUnlocked) { - zx_status_t status = _zx_futex_wait_deprecated( - reinterpret_cast(m), MtxSleeping, ZX_TIME_INFINITE); + zx_status_t status = + _zx_futex_wait(reinterpret_cast(m), MtxSleeping, + ZX_HANDLE_INVALID, ZX_TIME_INFINITE); if (status != ZX_ERR_BAD_STATE) // Normal race. CHECK_EQ(status, ZX_OK); } -- 2.7.4