diff options
Diffstat (limited to 'runtime/monitor-inl.h')
| -rw-r--r-- | runtime/monitor-inl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/monitor-inl.h b/runtime/monitor-inl.h index 3b1a998c99..f7e31a0842 100644 --- a/runtime/monitor-inl.h +++ b/runtime/monitor-inl.h @@ -30,7 +30,7 @@ inline ObjPtr<mirror::Object> Monitor::GetObject() REQUIRES_SHARED(Locks::mutato } // Check for request to set lock owner info. -inline void Monitor::CheckLockOwnerRequest(Thread* self) { +void Monitor::CheckLockOwnerRequest(Thread* self) { DCHECK(self != nullptr); Thread* request_thread = lock_owner_request_.load(std::memory_order_relaxed); if (request_thread == self) { @@ -40,13 +40,13 @@ inline void Monitor::CheckLockOwnerRequest(Thread* self) { } } -inline uintptr_t Monitor::LockOwnerInfoChecksum(ArtMethod* m, uint32_t dex_pc, Thread* t) { +uintptr_t Monitor::LockOwnerInfoChecksum(ArtMethod* m, uint32_t dex_pc, Thread* t) { uintptr_t dpc_and_thread = static_cast<uintptr_t>(dex_pc << 8) ^ reinterpret_cast<uintptr_t>(t); return reinterpret_cast<uintptr_t>(m) ^ dpc_and_thread ^ (dpc_and_thread << (/* ptr_size / 2 */ (sizeof m) << 2)); } -inline void Monitor::SetLockOwnerInfo(ArtMethod* method, uint32_t dex_pc, Thread* t) { +void Monitor::SetLockOwnerInfo(ArtMethod* method, uint32_t dex_pc, Thread* t) { lock_owner_method_.store(method, std::memory_order_relaxed); lock_owner_dex_pc_.store(dex_pc, std::memory_order_relaxed); lock_owner_.store(t, std::memory_order_relaxed); @@ -54,9 +54,8 @@ inline void Monitor::SetLockOwnerInfo(ArtMethod* method, uint32_t dex_pc, Thread lock_owner_sum_.store(sum, std::memory_order_relaxed); } -inline void Monitor::GetLockOwnerInfo(/*out*/ ArtMethod** method, - /*out*/ uint32_t* dex_pc, - Thread* t) { +void Monitor::GetLockOwnerInfo(/*out*/ArtMethod** method, /*out*/uint32_t* dex_pc, + Thread* t) { ArtMethod* owners_method; uint32_t owners_dex_pc; Thread* owner; @@ -80,6 +79,7 @@ inline void Monitor::GetLockOwnerInfo(/*out*/ ArtMethod** method, } } + } // namespace art #endif // ART_RUNTIME_MONITOR_INL_H_ |