diff options
| author | 2013-12-20 16:13:02 +0000 | |
|---|---|---|
| committer | 2013-12-20 16:13:02 +0000 | |
| commit | ac79f4dcaa0402f5d102bbdb7da938faea372d2e (patch) | |
| tree | aa7abdc45e1d7f63551b60f2e6ca12b7d28088f8 /runtime/mirror/object.cc | |
| parent | 93055a258c3a81d1b3b8eb44c9c71cf73ceeb8f0 (diff) | |
| parent | b122a4bbed34ab22b4c1541ee25e5cf22f12a926 (diff) | |
Merge "Tidy up memory barriers."
Diffstat (limited to 'runtime/mirror/object.cc')
| -rw-r--r-- | runtime/mirror/object.cc | 4 |
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; } |