ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update BacktraceOffline for LLVM rebase to r256229." into nyc-dev

Browse source
This commit is contained in:
Stephen Hines 2016-03-21 19:27:26 +00:00 • committed by Android (Google) Code Review
commit bfbb25da24
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libbacktrace/BacktraceOffline.cpp
View file

@ -564,7 +564,7 @@ DebugFrameInfo* ReadDebugFrameFromELFFile(const llvm::object::ELFFile<ELFT>* elf
uint64_t eh_frame_vaddr = 0; uint64_t eh_frame_vaddr = 0;
std::vector<uint8_t> eh_frame_data; std::vector<uint8_t> eh_frame_data;
for (auto it = elf->begin_sections(); it != elf->end_sections(); ++it) { for (auto it = elf->section_begin(); it != elf->section_end(); ++it) {
llvm::ErrorOr<llvm::StringRef> name = elf->getSectionName(&*it); llvm::ErrorOr<llvm::StringRef> name = elf->getSectionName(&*it);
if (name) { if (name) {
if (name.get() == ".debug_frame") { if (name.get() == ".debug_frame") {
@ -603,7 +603,7 @@ DebugFrameInfo* ReadDebugFrameFromELFFile(const llvm::object::ELFFile<ELFT>* elf
} }
std::vector<ProgramHeader> program_headers; std::vector<ProgramHeader> program_headers;
for (auto it = elf->begin_program_headers(); it != elf->end_program_headers(); ++it) { for (auto it = elf->program_header_begin(); it != elf->program_header_end(); ++it) {
ProgramHeader header; ProgramHeader header;
header.vaddr = it->p_vaddr; header.vaddr = it->p_vaddr;
header.file_offset = it->p_offset; header.file_offset = it->p_offset;