Use ArtMethod::GetDexFile() instead of using declaring class.
This is a follow-up to
https://android-review.googlesource.com/834082 .
Test: m test-art-host-gtest
Test: testrunner.py --host
Bug: 119830111
Change-Id: I5bd55b0293ef176385a7e9d8b296be6b470cfcc4
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 1472490..c7fa109 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -2515,7 +2515,7 @@
ArtMethod* caller_method = QuickArgumentVisitor::GetCallingMethod(sp);
ArtMethod* method = FindMethodFast<type, access_check>(method_idx, this_object, caller_method);
if (UNLIKELY(method == nullptr)) {
- const DexFile* dex_file = caller_method->GetDeclaringClass()->GetDexCache()->GetDexFile();
+ const DexFile* dex_file = caller_method->GetDexFile();
uint32_t shorty_len;
const char* shorty = dex_file->GetMethodShorty(dex_file->GetMethodId(method_idx), &shorty_len);
{
@@ -2648,7 +2648,7 @@
dex_method_idx = instr.VRegB_3rc();
}
- const DexFile& dex_file = caller_method->GetDeclaringClass()->GetDexFile();
+ const DexFile& dex_file = *caller_method->GetDexFile();
uint32_t shorty_len;
const char* shorty = dex_file.GetMethodShorty(dex_file.GetMethodId(dex_method_idx),
&shorty_len);