commit 0a5cd12a30e1b02833bdd94f11b74ecf4835ecb3
author Nicolas Geoffray <ngeoffray@google.com> Thu Jul 16 14:15:05 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu Jul 16 14:17:37 2015 +0100
tree dfc1b2c5cebab0714475c2e2aadb73692116079a
parent fec9d09bf7d2d54048b1df8e3c24a210e58dbc84

Make oatdump see the new vmap table generated by dextodex.

Change-Id: I48f3fb7320e39c864f8fbc478f970b18358408ec

runtime/oat_file-inl.h

diff --git a/runtime/oat_file-inl.h b/runtime/oat_file-inl.h
index 37d025a..5df6525 100644
--- a/runtime/oat_file-inl.h
+++ b/runtime/oat_file-inl.h
@@ -22,7 +22,7 @@
 namespace art {
 
 inline const OatQuickMethodHeader* OatFile::OatMethod::GetOatQuickMethodHeader() const {
-  const void* code = ArtMethod::EntryPointToCodePointer(GetQuickCode());
+  const void* code = ArtMethod::EntryPointToCodePointer(GetOatPointer<const void*>(code_offset_));
   if (code == nullptr) {
     return nullptr;
   }
@@ -71,7 +71,7 @@
 }
 
 inline const uint8_t* OatFile::OatMethod::GetGcMap() const {
-  const void* code = ArtMethod::EntryPointToCodePointer(GetQuickCode());
+  const void* code = ArtMethod::EntryPointToCodePointer(GetOatPointer<const void*>(code_offset_));
   if (code == nullptr) {
     return nullptr;
   }
@@ -122,7 +122,7 @@
 }
 
 inline const uint8_t* OatFile::OatMethod::GetMappingTable() const {
-  const void* code = ArtMethod::EntryPointToCodePointer(GetQuickCode());
+  const void* code = ArtMethod::EntryPointToCodePointer(GetOatPointer<const void*>(code_offset_));
   if (code == nullptr) {
     return nullptr;
   }
@@ -134,7 +134,7 @@
 }
 
 inline const uint8_t* OatFile::OatMethod::GetVmapTable() const {
-  const void* code = ArtMethod::EntryPointToCodePointer(GetQuickCode());
+  const void* code = ArtMethod::EntryPointToCodePointer(GetOatPointer<const void*>(code_offset_));
   if (code == nullptr) {
     return nullptr;
   }