diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-22 22:07:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-22 22:07:38 +0000 |
| commit | 7d5cf703f3c03769e5b2f7ebc9d216c52ee5c70d (patch) | |
| tree | 6d6f6aff838a440f418fe4a4e1451d9db8c8d5dc /runtime/monitor.h | |
| parent | be2cb9b284f3eca3b99571e83b7e0e3109f1ef06 (diff) | |
| parent | 3bdb873122964da7937eb070cbcf2ef638a8e459 (diff) | |
| download | art-7d5cf703f3c03769e5b2f7ebc9d216c52ee5c70d.zip art-7d5cf703f3c03769e5b2f7ebc9d216c52ee5c70d.tar.gz art-7d5cf703f3c03769e5b2f7ebc9d216c52ee5c70d.tar.bz2 | |
Merge "Revert "Fix an outstanding compaction bug in interpreter.""
Diffstat (limited to 'runtime/monitor.h')
| -rw-r--r-- | runtime/monitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/monitor.h b/runtime/monitor.h index 9e6d255..7af2d4c 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -116,7 +116,7 @@ class Monitor { return monitor_id_; } - static void InflateThinLocked(Thread* self, Handle<mirror::Object> obj, LockWord lock_word, + static void InflateThinLocked(Thread* self, Handle<mirror::Object>& obj, LockWord lock_word, uint32_t hash_code) NO_THREAD_SAFETY_ANALYSIS; static bool Deflate(Thread* self, mirror::Object* obj) |