diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-11-28 16:40:59 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2018-11-28 16:43:06 +0000 |
| commit | 7e09737125ddb8c6f243ac1882d2a23da3f109c4 (patch) | |
| tree | 1105bc475dec6b923c205cde3d90ca32cd3a803b /runtime/entrypoints/quick | |
| parent | 201330ccfb11989f7449486865c6f74b54f1a914 (diff) | |
| download | art-7e09737125ddb8c6f243ac1882d2a23da3f109c4.tar.gz art-7e09737125ddb8c6f243ac1882d2a23da3f109c4.tar.bz2 art-7e09737125ddb8c6f243ac1882d2a23da3f109c4.zip | |
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
Diffstat (limited to 'runtime/entrypoints/quick')
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 147249000f..c7fa109e31 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -2515,7 +2515,7 @@ static TwoWordReturn artInvokeCommon(uint32_t method_idx, 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 @@ extern "C" TwoWordReturn artInvokeInterfaceTrampoline(ArtMethod* interface_metho 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); |