diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-20 16:40:37 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-20 21:17:03 -0700 |
| commit | 3e5cf305db800b2989ad57b7cde8fb3cc9fa1b9e (patch) | |
| tree | 52a737323ebd505cf37ca0e4b2dcee6524fba07f /runtime/monitor.cc | |
| parent | 27a2b70f612af9afc0fb5392fb10059f6a0a3569 (diff) | |
| download | art-3e5cf305db800b2989ad57b7cde8fb3cc9fa1b9e.zip art-3e5cf305db800b2989ad57b7cde8fb3cc9fa1b9e.tar.gz art-3e5cf305db800b2989ad57b7cde8fb3cc9fa1b9e.tar.bz2 | |
Begin migration of art::Atomic to std::atomic.
Change-Id: I4858d9cbed95e5ca560956b9dabd976cebe68333
Diffstat (limited to 'runtime/monitor.cc')
| -rw-r--r-- | runtime/monitor.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index 0beb651..f783edb 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -99,12 +99,12 @@ Monitor::Monitor(Thread* self, Thread* owner, mirror::Object* obj, int32_t hash_ int32_t Monitor::GetHashCode() { while (!HasHashCode()) { - if (hash_code_.CompareAndSwap(0, mirror::Object::GenerateIdentityHashCode())) { + if (hash_code_.CompareExchangeWeakRelaxed(0, mirror::Object::GenerateIdentityHashCode())) { break; } } DCHECK(HasHashCode()); - return hash_code_.Load(); + return hash_code_.LoadRelaxed(); } bool Monitor::Install(Thread* self) { @@ -119,7 +119,7 @@ bool Monitor::Install(Thread* self) { break; } case LockWord::kHashCode: { - CHECK_EQ(hash_code_, static_cast<int32_t>(lw.GetHashCode())); + CHECK_EQ(hash_code_.LoadRelaxed(), static_cast<int32_t>(lw.GetHashCode())); break; } case LockWord::kFatLocked: { |