diff options
| author | 2015-08-03 11:56:49 +0100 | |
|---|---|---|
| committer | 2015-09-03 17:30:57 +0100 | |
| commit | 05792b98980741111b4d0a24d68cff2a8e070a3a (patch) | |
| tree | bad79a387bcbdaefc87c07b388099960ca9caff3 /runtime/interpreter/interpreter_switch_impl.cc | |
| parent | c26b4512a01d46756683a4f5e186a0b7f397f251 (diff) | |
ART: Move DexCache arrays to native.
This CL has a companion CL in libcore/
https://android-review.googlesource.com/162985
Change-Id: Icbc9e20ad1b565e603195b12714762bb446515fa
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index 544f7886e9..b5cc11e070 100644 --- a/runtime/interpreter/interpreter_switch_impl.cc +++ b/runtime/interpreter/interpreter_switch_impl.cc @@ -225,7 +225,9 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item, const size_t ref_idx = inst->VRegA_11x(inst_data); Object* obj_result = shadow_frame.GetVRegReference(ref_idx); if (do_assignability_check && obj_result != nullptr) { - Class* return_type = shadow_frame.GetMethod()->GetReturnType(); + size_t pointer_size = Runtime::Current()->GetClassLinker()->GetImagePointerSize(); + Class* return_type = shadow_frame.GetMethod()->GetReturnType(true /* resolve */, + pointer_size); // Re-load since it might have moved. obj_result = shadow_frame.GetVRegReference(ref_idx); if (return_type == nullptr) { |