diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-23 21:10:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-23 21:10:42 +0000 |
| commit | 66b68faa42cd36eb368f96c206b29c940ddda129 (patch) | |
| tree | ec8d7be0ffd659c3369c3a4f45d319b8be3c4892 /runtime/monitor.cc | |
| parent | 52925af1e3136bcf68bc5754fbfa407950235217 (diff) | |
| parent | 0cd81352a7c06e381951cea1b104fd73516f4341 (diff) | |
| download | art-66b68faa42cd36eb368f96c206b29c940ddda129.tar.gz art-66b68faa42cd36eb368f96c206b29c940ddda129.tar.bz2 art-66b68faa42cd36eb368f96c206b29c940ddda129.zip | |
Merge "Revert "Revert "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 3123fd7787..58e6dd49f9 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(); |