commit e00e20103fe798669b69de79e161650908659d05
author Vladimir Marko <vmarko@google.com> Tue May 14 14:42:02 2019 +0100
committer Vladimir Marko <vmarko@google.com> Wed May 15 07:55:45 2019 +0000
tree 5a02e219cd0ffb49ad3f6a6a36a1ccbb6339e3f7
parent 3f795d2ab38ede7821db73904ddd1ddadb6bac4e

oatdump: Fix oat code retrieval.

Test: m dump-oat-boot
Bug: 132685275
Change-Id: I151969ad6ac6bd7a8dce6c7427478cdde369bfd0

oatdump/oatdump.cc

diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 48244bc..5b7535d 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -716,8 +716,27 @@
         if (class_def != nullptr) {
           uint16_t class_def_index = dex_file->GetIndexForClassDef(*class_def);
           const OatFile::OatClass oat_class = oat_dex_file->GetOatClass(class_def_index);
-          size_t method_index = m->GetMethodIndex();
-          return oat_class.GetOatMethod(method_index).GetQuickCode();
+          uint32_t oat_method_index;
+          if (m->IsStatic() || m->IsDirect()) {
+            // Simple case where the oat method index was stashed at load time.
+            oat_method_index = m->GetMethodIndex();
+          } else {
+            // Compute the oat_method_index by search for its position in the class def.
+            ClassAccessor accessor(*dex_file, *class_def);
+            oat_method_index = accessor.NumDirectMethods();
+            bool found_virtual = false;
+            for (ClassAccessor::Method dex_method : accessor.GetVirtualMethods()) {
+              // Check method index instead of identity in case of duplicate method definitions.
+              if (dex_method.GetIndex() == m->GetDexMethodIndex()) {
+                found_virtual = true;
+                break;
+              }
+              ++oat_method_index;
+            }
+            CHECK(found_virtual) << "Didn't find oat method index for virtual method: "
+                                 << dex_file->PrettyMethod(m->GetDexMethodIndex());
+          }
+          return oat_class.GetOatMethod(oat_method_index).GetQuickCode();
         }
       }
     }