From ded66a01f81812e0129d17c3d08d5eda18433062 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 28 Oct 2014 18:12:55 -0700 Subject: Move MethodHelper::GetReturnType to mirror::ArtMethod. Also, fix missing handle in HasSameSignatureWithDifferentClassLoaders. Change-Id: I9e1ffd09be950ecc8346fc3c485760d82d9ecab3 --- runtime/interpreter/interpreter_goto_table_impl.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'runtime/interpreter/interpreter_goto_table_impl.cc') diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index b970879042..3a177ebde4 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -321,9 +321,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* const uint8_t vreg_index = inst->VRegA_11x(inst_data); Object* obj_result = shadow_frame.GetVRegReference(vreg_index); if (do_assignability_check && obj_result != NULL) { - StackHandleScope<1> hs(self); - MethodHelper mh(hs.NewHandle(shadow_frame.GetMethod())); - Class* return_type = mh.GetReturnType(); + Class* return_type = shadow_frame.GetMethod()->GetReturnType(); obj_result = shadow_frame.GetVRegReference(vreg_index); if (return_type == NULL) { // Return the pending exception. -- cgit v1.2.3