diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-22 17:57:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-22 17:57:52 +0000 |
| commit | 697726d42eaf804a1124c25dec58c2b0013a30e9 (patch) | |
| tree | 28b1dbbfe0bd2110e32c54293f0ea655e1a2de02 /runtime/monitor.cc | |
| parent | 65e3b69b366c6b7e06b87e7a1f76d30a51b1f777 (diff) | |
| parent | e09ae0920be57760fb390b6944bce420fa0b5582 (diff) | |
| download | art-697726d42eaf804a1124c25dec58c2b0013a30e9.tar.gz art-697726d42eaf804a1124c25dec58c2b0013a30e9.tar.bz2 art-697726d42eaf804a1124c25dec58c2b0013a30e9.zip | |
Merge "Fix an outstanding compaction bug in interpreter."
Diffstat (limited to 'runtime/monitor.cc')
| -rw-r--r-- | runtime/monitor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index 7d297cb958..cc38c59543 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -637,7 +637,7 @@ void Monitor::Inflate(Thread* self, Thread* owner, mirror::Object* obj, int32_t } } -void Monitor::InflateThinLocked(Thread* self, Handle<mirror::Object>& obj, LockWord lock_word, +void Monitor::InflateThinLocked(Thread* self, Handle<mirror::Object> obj, LockWord lock_word, uint32_t hash_code) { DCHECK_EQ(lock_word.GetState(), LockWord::kThinLocked); uint32_t owner_thread_id = lock_word.ThinLockOwner(); |