diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-28 18:12:55 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-28 18:36:32 -0700 |
| commit | ded66a01f81812e0129d17c3d08d5eda18433062 (patch) | |
| tree | 74a3f7bad1c020b0136d6c173633a361a479f5cb /runtime/interpreter/interpreter_switch_impl.cc | |
| parent | e0205d519dd417f749243b42b8711dfa313e5390 (diff) | |
| download | android_art-ded66a01f81812e0129d17c3d08d5eda18433062.tar.gz android_art-ded66a01f81812e0129d17c3d08d5eda18433062.tar.bz2 android_art-ded66a01f81812e0129d17c3d08d5eda18433062.zip | |
Move MethodHelper::GetReturnType to mirror::ArtMethod.
Also, fix missing handle in HasSameSignatureWithDifferentClassLoaders.
Change-Id: I9e1ffd09be950ecc8346fc3c485760d82d9ecab3
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index 1364ed2e5d..9fb90f187e 100644 --- a/runtime/interpreter/interpreter_switch_impl.cc +++ b/runtime/interpreter/interpreter_switch_impl.cc @@ -233,9 +233,7 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem const size_t ref_idx = inst->VRegA_11x(inst_data); Object* obj_result = shadow_frame.GetVRegReference(ref_idx); if (do_assignability_check && obj_result != NULL) { - StackHandleScope<1> hs(self); - MethodHelper mhs(hs.NewHandle(shadow_frame.GetMethod())); - Class* return_type = mhs.GetReturnType(); + Class* return_type = shadow_frame.GetMethod()->GetReturnType(); // Re-load since it might have moved. obj_result = shadow_frame.GetVRegReference(ref_idx); if (return_type == NULL) { |