diff options
Diffstat (limited to 'runtime/lock_word-inl.h')
-rw-r--r-- | runtime/lock_word-inl.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/lock_word-inl.h b/runtime/lock_word-inl.h index 30bf9bbaa6..59947f5694 100644 --- a/runtime/lock_word-inl.h +++ b/runtime/lock_word-inl.h @@ -33,7 +33,7 @@ inline uint32_t LockWord::ThinLockCount() const { inline Monitor* LockWord::FatLockMonitor() const { DCHECK_EQ(GetState(), kFatLocked); - return reinterpret_cast<Monitor*>(value_ << 1); + return reinterpret_cast<Monitor*>(value_ << kStateSize); } inline LockWord::LockWord() : value_(0) { @@ -41,10 +41,15 @@ inline LockWord::LockWord() : value_(0) { } inline LockWord::LockWord(Monitor* mon) - : value_((reinterpret_cast<uint32_t>(mon) >> 1) | (kStateFat << kStateShift)) { + : value_((reinterpret_cast<uint32_t>(mon) >> kStateSize) | (kStateFat << kStateShift)) { DCHECK_EQ(FatLockMonitor(), mon); } +inline uint32_t LockWord::GetHashCode() const { + DCHECK_EQ(GetState(), kHashCode); + return (value_ >> kHashShift) & kHashMask; +} + } // namespace art #endif // ART_RUNTIME_LOCK_WORD_INL_H_ |