diff options
author | Alex Light <allight@google.com> | 2014-07-08 09:53:18 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2014-07-08 10:06:08 -0700 |
commit | eefbe39799126afdf7d315a79359b9da23d1cef5 (patch) | |
tree | 7818d2124be53d5b01c11118ba6fe26f86adc0d5 /compiler/image_writer.cc | |
parent | c4c601b6dbe5e1a7321d663b36a531a87f21e931 (diff) | |
download | art-eefbe39799126afdf7d315a79359b9da23d1cef5.zip art-eefbe39799126afdf7d315a79359b9da23d1cef5.tar.gz art-eefbe39799126afdf7d315a79359b9da23d1cef5.tar.bz2 |
Fix some style nitpicks
Change-Id: Icfdd327f4ddf129f0a8607162c09ba271c1d49d9
Diffstat (limited to 'compiler/image_writer.cc')
-rw-r--r-- | compiler/image_writer.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index 2d25b7a..acfa607 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -796,9 +796,9 @@ void ImageWriter::PatchOatCodeAndMethods(File* elf_file) { }; const bool add_patches = compiler_driver_.GetCompilerOptions().GetIncludePatchInformation(); if (add_patches) { - // TODO if we are adding patches the resulting ELF file might have a - // potentially rather large amount of free space where patches might have been - // placed. We should adjust the ELF file to get rid of this excess space. + // TODO if we are adding patches the resulting ELF file might have a potentially rather large + // amount of free space where patches might have been placed. We should adjust the ELF file to + // get rid of this excess space. patches.reserve(compiler_driver_.GetCodeToPatch().size() + compiler_driver_.GetMethodsToPatch().size() + compiler_driver_.GetClassesToPatch().size()); @@ -892,7 +892,7 @@ void ImageWriter::PatchOatCodeAndMethods(File* elf_file) { } Elf32_Shdr* shdr = file->FindSectionByName(".oat_patches"); if (shdr != nullptr) { - DCHECK_EQ(shdr, file->FindSectionByType(SHT_OAT_PATCH)) + CHECK_EQ(shdr, file->FindSectionByType(SHT_OAT_PATCH)) << "Incorrect type for .oat_patches section"; CHECK_LE(patches.size() * sizeof(uintptr_t), shdr->sh_size) << "We got more patches than anticipated"; @@ -903,9 +903,8 @@ void ImageWriter::PatchOatCodeAndMethods(File* elf_file) { << "Section overlaps onto next section"; // It's mmap'd so we can just memcpy. memcpy(file->Begin() + shdr->sh_offset, patches.data(), patches.size()*sizeof(uintptr_t)); - // TODO We should fill in the newly empty space between the last patch and - // the start of the next section by moving the following sections down if - // possible. + // TODO We should fill in the newly empty space between the last patch and the start of the + // next section by moving the following sections down if possible. shdr->sh_size = patches.size() * sizeof(uintptr_t); } else { LOG(ERROR) << "Unable to find section header for SHT_OAT_PATCH"; |