From b122a4bbed34ab22b4c1541ee25e5cf22f12a926 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 19 Nov 2013 18:00:50 -0800 Subject: Tidy up memory barriers. Change-Id: I937ea93e6df1835ecfe2d4bb7d84c24fe7fc097b --- runtime/mirror/object.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/mirror/object.cc') 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(seed.load()); + expected_value = static_cast(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; } -- cgit v1.2.3-59-g8ed1b