diff options
Diffstat (limited to 'runtime/art_method.cc')
| -rw-r--r-- | runtime/art_method.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/runtime/art_method.cc b/runtime/art_method.cc index 238d9f3fe2..6f36016d25 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -24,7 +24,6 @@ #include "debugger.h" #include "dex_file-inl.h" #include "dex_instruction.h" -#include "entrypoints/entrypoint_utils.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "gc/accounting/card_table-inl.h" #include "interpreter/interpreter.h" @@ -146,10 +145,9 @@ ArtMethod* ArtMethod::FindOverriddenMethod(size_t pointer_size) { mirror::IfTable* iftable = GetDeclaringClass()->GetIfTable(); for (size_t i = 0; i < iftable->Count() && result == nullptr; i++) { mirror::Class* interface = iftable->GetInterface(i); - for (size_t j = 0; j < interface->NumVirtualMethods(); ++j) { - ArtMethod* interface_method = interface->GetVirtualMethod(j, pointer_size); - if (HasSameNameAndSignature(interface_method->GetInterfaceMethodIfProxy(sizeof(void*)))) { - result = interface_method; + for (ArtMethod& interface_method : interface->GetVirtualMethods(pointer_size)) { + if (HasSameNameAndSignature(interface_method.GetInterfaceMethodIfProxy(pointer_size))) { + result = &interface_method; break; } } @@ -157,8 +155,8 @@ ArtMethod* ArtMethod::FindOverriddenMethod(size_t pointer_size) { } } DCHECK(result == nullptr || - GetInterfaceMethodIfProxy(sizeof(void*))->HasSameNameAndSignature( - result->GetInterfaceMethodIfProxy(sizeof(void*)))); + GetInterfaceMethodIfProxy(pointer_size)->HasSameNameAndSignature( + result->GetInterfaceMethodIfProxy(pointer_size))); return result; } |