diff options
| -rw-r--r-- | dexlayout/dexdiag.cc | 6 | ||||
| -rw-r--r-- | runtime/oat.h | 1 | ||||
| -rw-r--r-- | runtime/oat_quick_method_header.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/dexlayout/dexdiag.cc b/dexlayout/dexdiag.cc index c577b6e105..78860e3f96 100644 --- a/dexlayout/dexdiag.cc +++ b/dexlayout/dexdiag.cc @@ -200,7 +200,8 @@ static void ProcessPageMap(uint64_t* pagemap, 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 @@ static void DisplayDexStatistics(size_t start, 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(); diff --git a/runtime/oat.h b/runtime/oat.h index e119b81bff..b7c715cc03 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -175,6 +175,7 @@ class PACKED(4) OatMethodOffsets { ~OatMethodOffsets(); + OatMethodOffsets(const OatMethodOffsets&) = default; OatMethodOffsets& operator=(const OatMethodOffsets&) = default; uint32_t code_offset_; diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h index f2a2af2a5f..152b0ba21b 100644 --- a/runtime/oat_quick_method_header.h +++ b/runtime/oat_quick_method_header.h @@ -54,6 +54,7 @@ class PACKED(4) OatQuickMethodHeader { return FromCodePointer(EntryPointToCodePointer(entry_point)); } + OatQuickMethodHeader(const OatQuickMethodHeader&) = default; OatQuickMethodHeader& operator=(const OatQuickMethodHeader&) = default; uintptr_t NativeQuickPcOffset(const uintptr_t pc) const { |