maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[darwin] switch blocking mutex from osspinlock to os_unfair_lock" 

> OSSpinLock is deprecated, so we are switching to `os_unfair_lock`. However, `os_unfair_lock` isn't available on older OSs, so we keep `OSSpinLock` as fallback.
>
> Also change runtime assumption check to static since they only ever check constant values.
>
> rdar://69588111
>
> Reviewed By: delcypher, yln
>
> Differential Revision: https://reviews.llvm.org/D97509

This reverts commit 71ef54337d.
This commit is contained in:
Hans Wennborg 2021-03-04 12:15:42 +01:00
parent 635db3514b
commit 840a16d3c4
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
View File

@ -70,7 +70,6 @@ extern "C" {
#include <mach/mach_time.h> #include <mach/mach_time.h>
#include <mach/vm_statistics.h> #include <mach/vm_statistics.h>
#include <malloc/malloc.h> #include <malloc/malloc.h>
#include <os/lock.h>
#include <os/log.h> #include <os/log.h>
#include <pthread.h> #include <pthread.h>
#include <sched.h> #include <sched.h>
@ -507,42 +506,22 @@ void MprotectMallocZones(void *addr, int prot) {
} }
BlockingMutex::BlockingMutex() { BlockingMutex::BlockingMutex() {
// Initialize all member variables to 0
internal_memset(this, 0, sizeof(*this)); internal_memset(this, 0, sizeof(*this));
static_assert(sizeof(os_unfair_lock_t) <= sizeof(opaque_storage_),
"Not enough space in opaque storage to use os_unfair_lock");
static_assert(sizeof(OSSpinLock) <= sizeof(opaque_storage_),
"Not enough space in opaque storage to use OSSpinLock");
} }
static bool UnfairLockAvailable() { return bool(os_unfair_lock_lock); }
static_assert(OS_UNFAIR_LOCK_INIT._os_unfair_lock_opaque == 0,
"os_unfair_lock does not initialize to 0");
static_assert(OS_SPINLOCK_INIT == 0, "OSSpinLock does not initialize to 0");
void BlockingMutex::Lock() { void BlockingMutex::Lock() {
CHECK(sizeof(OSSpinLock) <= sizeof(opaque_storage_));
CHECK_EQ(OS_SPINLOCK_INIT, 0);
CHECK_EQ(owner_, 0); CHECK_EQ(owner_, 0);
if (UnfairLockAvailable()) { OSSpinLockLock((OSSpinLock*)&opaque_storage_);
os_unfair_lock_lock((os_unfair_lock *)&opaque_storage_);
} else {
OSSpinLockLock((OSSpinLock *)&opaque_storage_);
}
} }
void BlockingMutex::Unlock() { void BlockingMutex::Unlock() {
if (UnfairLockAvailable()) { OSSpinLockUnlock((OSSpinLock*)&opaque_storage_);
os_unfair_lock_unlock((os_unfair_lock *)&opaque_storage_);
} else {
OSSpinLockUnlock((OSSpinLock *)&opaque_storage_);
}
} }
void BlockingMutex::CheckLocked() { void BlockingMutex::CheckLocked() {
if (UnfairLockAvailable()) { CHECK_NE(*(OSSpinLock*)&opaque_storage_, 0);
CHECK_NE((*(os_unfair_lock *)&opaque_storage_)._os_unfair_lock_opaque, 0);
} else {
CHECK_NE(*(OSSpinLock *)&opaque_storage_, 0);
}
} }
u64 NanoTime() { u64 NanoTime() {