diff options
| author | 2014-04-17 23:06:26 +0000 | |
|---|---|---|
| committer | 2014-04-17 23:06:27 +0000 | |
| commit | a092ee404ababbf8fc945111dc4a571284c9f02f (patch) | |
| tree | b275ab9eedb86dcba9b62ed3be2c123f9322cf29 /runtime/mirror/object.cc | |
| parent | 94e8a97310af35cb0bae309e796b554cdb586ca5 (diff) | |
| parent | 4d7f61d44a732cfbc8573e5d93364983fd746888 (diff) | |
Merge "Use non volatile lock words in semispace collector."
Diffstat (limited to 'runtime/mirror/object.cc')
| -rw-r--r-- | runtime/mirror/object.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc index be7e9f20ec..766bbc9892 100644 --- a/runtime/mirror/object.cc +++ b/runtime/mirror/object.cc @@ -150,7 +150,7 @@ int32_t Object::GenerateIdentityHashCode() { int32_t Object::IdentityHashCode() const { mirror::Object* current_this = const_cast<mirror::Object*>(this); while (true) { - LockWord lw = current_this->GetLockWord(); + LockWord lw = current_this->GetLockWord(false); switch (lw.GetState()) { case LockWord::kUnlocked: { // Try to compare and swap in a new hash, if we succeed we will return the hash on the next |