From 50fb795a0e6bec5264005d3ef8cb9e6fe4d97784 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Mon, 8 Apr 2019 23:20:09 +0000 Subject: Fix incorrect change during refactoring. cxa_guard_abort should still broadcast on exit. git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@357956 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit cb31f3d9f6ff64c044921996d2bb2efc4c028765) Bug: http://b/189279320 Test: treehugger Change-Id: Ie916355d58cb03da1f0d006b3da2a284f93becf3 --- src/cxa_guard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cxa_guard.cpp b/src/cxa_guard.cpp index 1f5a88a..8803415 100644 --- a/src/cxa_guard.cpp +++ b/src/cxa_guard.cpp @@ -211,7 +211,7 @@ _LIBCXXABI_FUNC_VIS void __cxa_guard_release(guard_type *raw_guard_object) { } _LIBCXXABI_FUNC_VIS void __cxa_guard_abort(guard_type *raw_guard_object) { - GlobalMutexGuard gmutex("__cxa_guard_abort", OnRelease::UNLOCK); + GlobalMutexGuard gmutex("__cxa_guard_abort", OnRelease::UNLOCK_AND_BROADCAST); GuardObject guard(raw_guard_object); guard.write(GuardValue::ZERO()); } -- cgit v1.2.3