ART: Make elf loading not abort
Changes elf_file code to use less CHECKs and instead return error
values (usually nullptr). This avoids aborts.
In oat_file, when loading an oat file fails, try to unlink at. If
this succeeds, on the next run we may compile again.
Bug: 17491333
(cherry picked from commit afa6b8e93a0dc0de33c9d404945c7c5621e20b1a)
Change-Id: I50fdd2edacd86f25d4dacf2180ce2a6105eaf4af
diff --git a/compiler/elf_fixup.cc b/compiler/elf_fixup.cc
index bbfbc6e..0d34879 100644
--- a/compiler/elf_fixup.cc
+++ b/compiler/elf_fixup.cc
@@ -89,17 +89,18 @@
bool ElfFixup::FixupSectionHeaders(ElfFile& elf_file, uintptr_t base_address) {
for (Elf32_Word i = 0; i < elf_file.GetSectionHeaderNum(); i++) {
- Elf32_Shdr& sh = elf_file.GetSectionHeader(i);
+ Elf32_Shdr* sh = elf_file.GetSectionHeader(i);
+ CHECK(sh != nullptr);
// 0 implies that the section will not exist in the memory of the process
- if (sh.sh_addr == 0) {
+ if (sh->sh_addr == 0) {
continue;
}
if (DEBUG_FIXUP) {
LOG(INFO) << StringPrintf("In %s moving Elf32_Shdr[%d] from 0x%08x to 0x%08" PRIxPTR,
elf_file.GetFile().GetPath().c_str(), i,
- sh.sh_addr, sh.sh_addr + base_address);
+ sh->sh_addr, sh->sh_addr + base_address);
}
- sh.sh_addr += base_address;
+ sh->sh_addr += base_address;
}
return true;
}
@@ -107,18 +108,19 @@
bool ElfFixup::FixupProgramHeaders(ElfFile& elf_file, uintptr_t base_address) {
// TODO: ELFObjectFile doesn't have give to Elf32_Phdr, so we do that ourselves for now.
for (Elf32_Word i = 0; i < elf_file.GetProgramHeaderNum(); i++) {
- Elf32_Phdr& ph = elf_file.GetProgramHeader(i);
- CHECK_EQ(ph.p_vaddr, ph.p_paddr) << elf_file.GetFile().GetPath() << " i=" << i;
- CHECK((ph.p_align == 0) || (0 == ((ph.p_vaddr - ph.p_offset) & (ph.p_align - 1))))
+ Elf32_Phdr* ph = elf_file.GetProgramHeader(i);
+ CHECK(ph != nullptr);
+ CHECK_EQ(ph->p_vaddr, ph->p_paddr) << elf_file.GetFile().GetPath() << " i=" << i;
+ CHECK((ph->p_align == 0) || (0 == ((ph->p_vaddr - ph->p_offset) & (ph->p_align - 1))))
<< elf_file.GetFile().GetPath() << " i=" << i;
if (DEBUG_FIXUP) {
LOG(INFO) << StringPrintf("In %s moving Elf32_Phdr[%d] from 0x%08x to 0x%08" PRIxPTR,
elf_file.GetFile().GetPath().c_str(), i,
- ph.p_vaddr, ph.p_vaddr + base_address);
+ ph->p_vaddr, ph->p_vaddr + base_address);
}
- ph.p_vaddr += base_address;
- ph.p_paddr += base_address;
- CHECK((ph.p_align == 0) || (0 == ((ph.p_vaddr - ph.p_offset) & (ph.p_align - 1))))
+ ph->p_vaddr += base_address;
+ ph->p_paddr += base_address;
+ CHECK((ph->p_align == 0) || (0 == ((ph->p_vaddr - ph->p_offset) & (ph->p_align - 1))))
<< elf_file.GetFile().GetPath() << " i=" << i;
}
return true;
@@ -128,20 +130,21 @@
Elf32_Word section_type = dynamic ? SHT_DYNSYM : SHT_SYMTAB;
// TODO: Unfortunate ELFObjectFile has protected symbol access, so use ElfFile
Elf32_Shdr* symbol_section = elf_file.FindSectionByType(section_type);
- if (symbol_section == NULL) {
+ if (symbol_section == nullptr) {
// file is missing optional .symtab
CHECK(!dynamic) << elf_file.GetFile().GetPath();
return true;
}
for (uint32_t i = 0; i < elf_file.GetSymbolNum(*symbol_section); i++) {
- Elf32_Sym& symbol = elf_file.GetSymbol(section_type, i);
- if (symbol.st_value != 0) {
+ Elf32_Sym* symbol = elf_file.GetSymbol(section_type, i);
+ CHECK(symbol != nullptr);
+ if (symbol->st_value != 0) {
if (DEBUG_FIXUP) {
LOG(INFO) << StringPrintf("In %s moving Elf32_Sym[%d] from 0x%08x to 0x%08" PRIxPTR,
elf_file.GetFile().GetPath().c_str(), i,
- symbol.st_value, symbol.st_value + base_address);
+ symbol->st_value, symbol->st_value + base_address);
}
- symbol.st_value += base_address;
+ symbol->st_value += base_address;
}
}
return true;
@@ -149,10 +152,11 @@
bool ElfFixup::FixupRelocations(ElfFile& elf_file, uintptr_t base_address) {
for (Elf32_Word i = 0; i < elf_file.GetSectionHeaderNum(); i++) {
- Elf32_Shdr& sh = elf_file.GetSectionHeader(i);
- if (sh.sh_type == SHT_REL) {
- for (uint32_t i = 0; i < elf_file.GetRelNum(sh); i++) {
- Elf32_Rel& rel = elf_file.GetRel(sh, i);
+ Elf32_Shdr* sh = elf_file.GetSectionHeader(i);
+ CHECK(sh != nullptr);
+ if (sh->sh_type == SHT_REL) {
+ for (uint32_t i = 0; i < elf_file.GetRelNum(*sh); i++) {
+ Elf32_Rel& rel = elf_file.GetRel(*sh, i);
if (DEBUG_FIXUP) {
LOG(INFO) << StringPrintf("In %s moving Elf32_Rel[%d] from 0x%08x to 0x%08" PRIxPTR,
elf_file.GetFile().GetPath().c_str(), i,
@@ -160,9 +164,9 @@
}
rel.r_offset += base_address;
}
- } else if (sh.sh_type == SHT_RELA) {
- for (uint32_t i = 0; i < elf_file.GetRelaNum(sh); i++) {
- Elf32_Rela& rela = elf_file.GetRela(sh, i);
+ } else if (sh->sh_type == SHT_RELA) {
+ for (uint32_t i = 0; i < elf_file.GetRelaNum(*sh); i++) {
+ Elf32_Rela& rela = elf_file.GetRela(*sh, i);
if (DEBUG_FIXUP) {
LOG(INFO) << StringPrintf("In %s moving Elf32_Rela[%d] from 0x%08x to 0x%08" PRIxPTR,
elf_file.GetFile().GetPath().c_str(), i,
diff --git a/compiler/elf_patcher.cc b/compiler/elf_patcher.cc
index f192227..92eb4d8 100644
--- a/compiler/elf_patcher.cc
+++ b/compiler/elf_patcher.cc
@@ -276,7 +276,7 @@
<< "We got more patches than anticipated";
CHECK_LE(reinterpret_cast<uintptr_t>(elf_file_->Begin()) + shdr->sh_offset + shdr->sh_size,
reinterpret_cast<uintptr_t>(elf_file_->End())) << "section is too large";
- CHECK(shdr == &elf_file_->GetSectionHeader(elf_file_->GetSectionHeaderNum() - 1) ||
+ CHECK(shdr == elf_file_->GetSectionHeader(elf_file_->GetSectionHeaderNum() - 1) ||
shdr->sh_offset + shdr->sh_size <= (shdr + 1)->sh_offset)
<< "Section overlaps onto next section";
// It's mmap'd so we can just memcpy.
diff --git a/compiler/elf_stripper.cc b/compiler/elf_stripper.cc
index 0b86ad0..457d8a0 100644
--- a/compiler/elf_stripper.cc
+++ b/compiler/elf_stripper.cc
@@ -72,13 +72,15 @@
section_headers.reserve(elf_file->GetSectionHeaderNum());
- Elf32_Shdr& string_section = elf_file->GetSectionNameStringSection();
+ Elf32_Shdr* string_section = elf_file->GetSectionNameStringSection();
+ CHECK(string_section != nullptr);
for (Elf32_Word i = 0; i < elf_file->GetSectionHeaderNum(); i++) {
- Elf32_Shdr& sh = elf_file->GetSectionHeader(i);
- const char* name = elf_file->GetString(string_section, sh.sh_name);
- if (name == NULL) {
+ Elf32_Shdr* sh = elf_file->GetSectionHeader(i);
+ CHECK(sh != nullptr);
+ const char* name = elf_file->GetString(*string_section, sh->sh_name);
+ if (name == nullptr) {
CHECK_EQ(0U, i);
- section_headers.push_back(sh);
+ section_headers.push_back(*sh);
section_headers_original_indexes.push_back(0);
continue;
}
@@ -87,32 +89,34 @@
|| (strcmp(name, ".symtab") == 0)) {
continue;
}
- section_headers.push_back(sh);
+ section_headers.push_back(*sh);
section_headers_original_indexes.push_back(i);
}
CHECK_NE(0U, section_headers.size());
CHECK_EQ(section_headers.size(), section_headers_original_indexes.size());
// section 0 is the NULL section, sections start at offset of first section
- Elf32_Off offset = elf_file->GetSectionHeader(1).sh_offset;
+ CHECK(elf_file->GetSectionHeader(1) != nullptr);
+ Elf32_Off offset = elf_file->GetSectionHeader(1)->sh_offset;
for (size_t i = 1; i < section_headers.size(); i++) {
Elf32_Shdr& new_sh = section_headers[i];
- Elf32_Shdr& old_sh = elf_file->GetSectionHeader(section_headers_original_indexes[i]);
- CHECK_EQ(new_sh.sh_name, old_sh.sh_name);
- if (old_sh.sh_addralign > 1) {
- offset = RoundUp(offset, old_sh.sh_addralign);
+ Elf32_Shdr* old_sh = elf_file->GetSectionHeader(section_headers_original_indexes[i]);
+ CHECK(old_sh != nullptr);
+ CHECK_EQ(new_sh.sh_name, old_sh->sh_name);
+ if (old_sh->sh_addralign > 1) {
+ offset = RoundUp(offset, old_sh->sh_addralign);
}
- if (old_sh.sh_offset == offset) {
+ if (old_sh->sh_offset == offset) {
// already in place
- offset += old_sh.sh_size;
+ offset += old_sh->sh_size;
continue;
}
// shift section earlier
memmove(elf_file->Begin() + offset,
- elf_file->Begin() + old_sh.sh_offset,
- old_sh.sh_size);
+ elf_file->Begin() + old_sh->sh_offset,
+ old_sh->sh_size);
new_sh.sh_offset = offset;
- offset += old_sh.sh_size;
+ offset += old_sh->sh_size;
}
Elf32_Off shoff = offset;