commit 228602f562f1d130d06e60a98752d99c2d467d6a
author Ian Rogers <irogers@google.com> Thu Jul 10 02:07:54 2014 -0700
committer Ian Rogers <irogers@google.com> Thu Jul 10 02:07:54 2014 -0700
tree ee5b543695843ce48ebec4ffc88514ff679f4e93
parent be2a1df15a31a5223ee9af3015a00c31d2ad2e10

Make CAS operations in Object use art::Atomic.

Make naming consistent with art::Atomic.

Change-Id: If3abdb019ef8b53bd809e3fef3fd5248aeb27e9a

runtime/mirror/object.cc

diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc
index 422a88b..e58091f 100644
--- a/runtime/mirror/object.cc
+++ b/runtime/mirror/object.cc
@@ -156,7 +156,7 @@
         // loop iteration.
         LockWord hash_word(LockWord::FromHashCode(GenerateIdentityHashCode()));
         DCHECK_EQ(hash_word.GetState(), LockWord::kHashCode);
-        if (const_cast<Object*>(this)->CasLockWord(lw, hash_word)) {
+        if (const_cast<Object*>(this)->CasLockWordWeakSequentiallyConsistent(lw, hash_word)) {
           return hash_word.GetHashCode();
         }
         break;