commit 093a6fbcaa1f9fd2924e97906109482a8f31a247
author David Sehr <sehr@google.com> Tue May 09 15:41:09 2017 -0700
committer David Sehr <sehr@google.com> Wed May 10 12:50:43 2017 -0700
tree cd19863d64d8526de6d3adc1bf1f3b6bfcd041e7
parent 0ac500f2d5d8e9948e5041e601c9dec805c7b74b

Fix page accounting for multidex

Dexdiag was using the offset into the mapping rather than into the dex
file for determining the types of pages.  This resulted in multidex
files having incorrect accounting.

Bug: 38181622
Test: make test-art-target-gtest-dexdiag_test
Change-Id: I00a4e21db5f57f75642a17e8edaa9c73b8b529b6
(cherry picked from commit dda59691e059101b00c70c49e7e2718d3b7c5d99)

dexlayout/dexdiag.cc

diff --git a/dexlayout/dexdiag.cc b/dexlayout/dexdiag.cc
index c577b6e..78860e3 100644
--- a/dexlayout/dexdiag.cc
+++ b/dexlayout/dexdiag.cc
@@ -200,7 +200,8 @@
   for (size_t page = start; page < end; ++page) {
     char type_char = '.';
     if (PM_PAGEMAP_PRESENT(pagemap[page])) {
-      uint16_t type = FindSectionTypeForPage(page, sections);
+      const size_t dex_page_offset = page - start;
+      uint16_t type = FindSectionTypeForPage(dex_page_offset, sections);
       page_counts->Increment(type);
       type_char = PageTypeChar(type);
     }
@@ -231,7 +232,8 @@
     return;
   }
   for (size_t page = start; page < end; ++page) {
-    mapped_pages.Increment(FindSectionTypeForPage(page, sections));
+    const size_t dex_page_offset = page - start;
+    mapped_pages.Increment(FindSectionTypeForPage(dex_page_offset, sections));
   }
   size_t total_resident_pages = 0;
   printer->PrintHeader();