commit d16bb3f0dc17d77db7022150d0710fcbb8b6fd9d
author Alex Light <allight@google.com> Thu Dec 17 00:10:38 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 17 00:10:38 2015 +0000
tree ff127f8ba7fa743633063ba28e0f37cac2075e3e
parent 1c70f18dce7705ff70147ddebf65a97f66df8d5c
parent e050c8f927b41e1f5eca70707ac63015f362703a

Merge "Ensure that ClassTable has correct alignment in image."

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_);