diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-04-23 16:12:40 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2015-04-23 21:11:40 -0700 |
| commit | 60f63f53c01cb38ca18a815603282e802a6cf918 (patch) | |
| tree | 4f18427401ead0c790e926672957189a0c0a39eb /runtime/lock_word-inl.h | |
| parent | 633a37ece49c5afcf3fa9a89692f07d19c56229b (diff) | |
| download | android_art-60f63f53c01cb38ca18a815603282e802a6cf918.tar.gz android_art-60f63f53c01cb38ca18a815603282e802a6cf918.tar.bz2 android_art-60f63f53c01cb38ca18a815603282e802a6cf918.zip | |
Use the lock word bits for Baker-style read barrier.
This enables the standard object header to be used with the
Baker-style read barrier.
Bug: 19355854
Bug: 12687968
Change-Id: Ie552b6e1dfe30e96cb1d0895bd0dff25f9d7d015
Diffstat (limited to 'runtime/lock_word-inl.h')
| -rw-r--r-- | runtime/lock_word-inl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/lock_word-inl.h b/runtime/lock_word-inl.h index d831bfbee2..341501b46c 100644 --- a/runtime/lock_word-inl.h +++ b/runtime/lock_word-inl.h @@ -53,6 +53,7 @@ inline LockWord::LockWord() : value_(0) { inline LockWord::LockWord(Monitor* mon, uint32_t rb_state) : value_(mon->GetMonitorId() | (rb_state << kReadBarrierStateShift) | (kStateFat << kStateShift)) { + DCHECK_EQ(rb_state & ~kReadBarrierStateMask, 0U); #ifndef __LP64__ DCHECK_ALIGNED(mon, kMonitorIdAlignment); #endif |