commit e050c8f927b41e1f5eca70707ac63015f362703a
author Alex Light <allight@google.com> Wed Dec 16 15:52:51 2015 -0800
committer Alex Light <allight@google.com> Wed Dec 16 15:52:51 2015 -0800
tree 72b981e8f31d454aadcd47b43450eb2f817b700a
parent bc90a0538e56f98b8e138cb622e6b9d834244ad9

Ensure that ClassTable has correct alignment in image.

Change-Id: I645b44fae1ec129364449af552c745bf32486b1a

compiler/image_writer.cc

diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index fce08ea..afa4904 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -1275,6 +1275,8 @@
   auto* interned_strings_section = &sections[ImageHeader::kSectionInternedStrings];
   *interned_strings_section = ImageSection(cur_pos, intern_table_bytes_);
   cur_pos = interned_strings_section->End();
+  // Round up to the alignment the class table expects. See HashSet::WriteToMemory.
+  cur_pos = RoundUp(cur_pos, sizeof(uint64_t));
   // Calculate the size of the class table section.
   auto* class_table_section = &sections[ImageHeader::kSectionClassTable];
   *class_table_section = ImageSection(cur_pos, class_table_bytes_);