From 6fcaf3f7b5c4fca67b506c4a4233e8373be6d48e Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 8 Jul 2015 15:55:28 +0100 Subject: [PATCH] Fix oatdump after ArtMethod change. ArtMethod is now word aligned, and not necessarily 8 byte aligned. Change-Id: I8bd6b2f156d7f2ab191d6f2675b013713bbf258d --- oatdump/oatdump.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index cf4f82210..8dde547bb 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -1618,7 +1618,8 @@ class ImageDumper { stats_.alignment_bytes += bitmap_section.Offset() - image_header_.GetImageSize(); stats_.bitmap_bytes += bitmap_section.Size(); stats_.art_field_bytes += field_section.Size(); - stats_.art_method_bytes += method_section.Size(); + // RoundUp to 8 bytes to match the intern table alignment expectation. + stats_.art_method_bytes += RoundUp(method_section.Size(), sizeof(uint64_t)); stats_.interned_strings_bytes += intern_section.Size(); stats_.Dump(os); os << "\n"; -- 2.11.0