Refactor code aroud method resolution.
- Make unresolved AOT entrypoints use the tls cache
- Remove duplicate code
- Inline method access checks logic in its only use.
- Fix in ClassLinker::ResolveMethodWithoutInvokeType() by calling shared
helper.
Test: test.py
Change-Id: I1f42b5d0ac1dcd9c5eb483db9c5c5eefc9b2f4d1
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index e109a50..8082d46 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -9471,19 +9471,7 @@
Thread::Current()->AssertPendingException();
return nullptr;
}
- if (klass->IsInterface()) {
- resolved = klass->FindInterfaceMethod(dex_cache.Get(), method_idx, image_pointer_size_);
- } else {
- resolved = klass->FindClassMethod(dex_cache.Get(), method_idx, image_pointer_size_);
- }
- if (resolved != nullptr &&
- hiddenapi::ShouldDenyAccessToMember(
- resolved,
- hiddenapi::AccessContext(class_loader.Get(), dex_cache.Get()),
- hiddenapi::AccessMethod::kLinking)) {
- resolved = nullptr;
- }
- return resolved;
+ return FindResolvedMethod(klass, dex_cache.Get(), class_loader.Get(), method_idx);
}
ArtField* ClassLinker::LookupResolvedField(uint32_t field_idx,