summaryrefslogtreecommitdiff
path: root/runtime/mirror/object.cc
diff options
context:
space:
mode:
author Ian Rogers <irogers@google.com> 2013-11-19 18:00:50 -0800
committer Ian Rogers <irogers@google.com> 2013-12-20 08:01:57 -0800
commitb122a4bbed34ab22b4c1541ee25e5cf22f12a926 (patch)
tree624f16271f4481a8fd5aa2f607385f490dc7b3ae /runtime/mirror/object.cc
parente40687d053b89c495b6fbeb7a766b01c9c7e039c (diff)
Tidy up memory barriers.
Change-Id: I937ea93e6df1835ecfe2d4bb7d84c24fe7fc097b
Diffstat (limited to 'runtime/mirror/object.cc')
-rw-r--r--runtime/mirror/object.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc
index 008a17356f..bdb3250d57 100644
--- a/runtime/mirror/object.cc
+++ b/runtime/mirror/object.cc
@@ -89,10 +89,10 @@ int32_t Object::GenerateIdentityHashCode() {
static AtomicInteger seed(987654321 + std::time(nullptr));
int32_t expected_value, new_value;
do {
- expected_value = static_cast<uint32_t>(seed.load());
+ expected_value = static_cast<uint32_t>(seed.Load());
new_value = expected_value * 1103515245 + 12345;
} while ((expected_value & LockWord::kHashMask) == 0 ||
- !seed.compare_and_swap(expected_value, new_value));
+ !seed.CompareAndSwap(expected_value, new_value));
return expected_value & LockWord::kHashMask;
}