diff options
author | Mathieu Chartier <mathieuc@google.com> | 2014-05-22 16:48:55 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-23 12:55:45 -0700 |
commit | 0cd81352a7c06e381951cea1b104fd73516f4341 (patch) | |
tree | fcc8ff9cdeb608d0913097aa1fb64d1879f11ffa /runtime/monitor.h | |
parent | dfd301f19800a4f168283cf2d0b15b2c09071955 (diff) | |
download | art-0cd81352a7c06e381951cea1b104fd73516f4341.zip art-0cd81352a7c06e381951cea1b104fd73516f4341.tar.gz art-0cd81352a7c06e381951cea1b104fd73516f4341.tar.bz2 |
Revert "Revert "Fix an outstanding compaction bug in interpreter.""
Fixed the generic trampoline to not use ToJObject when unnecessary.
Bug: 15167269
This reverts commit 3bdb873122964da7937eb070cbcf2ef638a8e459.
Change-Id: I0525d0e0f3afb753c770e1572070a0fa22b02271
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 7af2d4c..9e6d255 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) |