Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab20efc authored by Stephen Hines's avatar Stephen Hines Committed by android-build-merger
Browse files

Merge "Update BacktraceOffline for LLVM rebase to r256229." 

am: 922e151b

* commit '922e151b':
  Update BacktraceOffline for LLVM rebase to r256229.
parents 3c30fe11 922e151b

libbacktrace/BacktraceOffline.cpp

+2 −2
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ DebugFrameInfo* ReadDebugFrameFromELFFile(const llvm::object::ELFFile<ELFT>* elf 
  uint64_t eh_frame_vaddr = 0;

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

    if (name) {

      if (name.get() == ".debug_frame") {
@@ -603,7 +603,7 @@ DebugFrameInfo* ReadDebugFrameFromELFFile(const llvm::object::ELFFile<ELFT>* elf 
  }



  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;

    header.vaddr = it->p_vaddr;

    header.file_offset = it->p_offset;