diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2013-10-25 23:03:21 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2013-10-25 23:03:21 +0000 |
| commit | 8f0c5bdd9650256501bad9fc5dedc977f4ca2247 (patch) | |
| tree | 788d94f4e011b1d42deeb0b97b36d4f03bfc1fd7 | |
| parent | b8c9c60d9ca962b50cb67e5a6966d4be3c9db2ff (diff) | |
| download | compiler-rt-8f0c5bdd9650256501bad9fc5dedc977f4ca2247.tar.gz compiler-rt-8f0c5bdd9650256501bad9fc5dedc977f4ca2247.tar.bz2 compiler-rt-8f0c5bdd9650256501bad9fc5dedc977f4ca2247.tar.xz | |
Rename SpinMutex::AssertHeld to CheckLocked, for consistency with BlockingMutex.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@193447 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_allocator.h | 2 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_mutex.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_allocator.h b/lib/sanitizer_common/sanitizer_allocator.h index 0e99d298..6075cfe9 100644 --- a/lib/sanitizer_common/sanitizer_allocator.h +++ b/lib/sanitizer_common/sanitizer_allocator.h @@ -1051,7 +1051,7 @@ class LargeMmapAllocator { // This function does the same as GetBlockBegin, but is much faster. // Must be called with the allocator locked. void *GetBlockBeginFastLocked(void *ptr) { - mutex_.AssertHeld(); + mutex_.CheckLocked(); uptr p = reinterpret_cast<uptr>(ptr); uptr n = n_chunks_; if (!n) return 0; diff --git a/lib/sanitizer_common/sanitizer_mutex.h b/lib/sanitizer_common/sanitizer_mutex.h index 0f05f67f..e812fce9 100644 --- a/lib/sanitizer_common/sanitizer_mutex.h +++ b/lib/sanitizer_common/sanitizer_mutex.h @@ -40,7 +40,7 @@ class StaticSpinMutex { atomic_store(&state_, 0, memory_order_release); } - void AssertHeld() { + void CheckLocked() { CHECK_EQ(atomic_load(&state_, memory_order_relaxed), 1); } |