From 0cd81352a7c06e381951cea1b104fd73516f4341 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 22 May 2014 16:48:55 -0700 Subject: 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 --- runtime/monitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/monitor.cc') diff --git a/runtime/monitor.cc b/runtime/monitor.cc index c53520de12..4a4dffb938 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& obj, LockWord lock_word, +void Monitor::InflateThinLocked(Thread* self, Handle obj, LockWord lock_word, uint32_t hash_code) { DCHECK_EQ(lock_word.GetState(), LockWord::kThinLocked); uint32_t owner_thread_id = lock_word.ThinLockOwner(); -- cgit v1.2.3