From 33f250931c081497dd68c70cf5be63f77efe0ffa Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 20 Jul 2015 20:07:50 +0000 Subject: Remove Elf_Rela_Iter and Elf_Rel_Iter. Use just the pointers and check for invalid relocation sections. llvm-svn: 242700 --- llvm/tools/llvm-readobj/ARMEHABIPrinter.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'llvm/tools/llvm-readobj/ARMEHABIPrinter.h') diff --git a/llvm/tools/llvm-readobj/ARMEHABIPrinter.h b/llvm/tools/llvm-readobj/ARMEHABIPrinter.h index dd2490d503d..b223770e1f7 100644 --- a/llvm/tools/llvm-readobj/ARMEHABIPrinter.h +++ b/llvm/tools/llvm-readobj/ARMEHABIPrinter.h @@ -310,8 +310,7 @@ class PrinterContext { typedef typename object::ELFFile::Elf_Sym Elf_Sym; typedef typename object::ELFFile::Elf_Shdr Elf_Shdr; - - typedef typename object::ELFFile::Elf_Rel_Iter Elf_Rel_iterator; + typedef typename object::ELFFile::Elf_Rel Elf_Rel; static const size_t IndexTableEntrySize; @@ -366,12 +365,11 @@ PrinterContext::FindExceptionTable(unsigned IndexSectionIndex, for (const Elf_Shdr &Sec : ELF->sections()) { if (Sec.sh_type == ELF::SHT_REL && Sec.sh_info == IndexSectionIndex) { - for (Elf_Rel_iterator RI = ELF->rel_begin(&Sec), RE = ELF->rel_end(&Sec); - RI != RE; ++RI) { - if (RI->r_offset == static_cast(IndexTableOffset)) { + for (const Elf_Rel &R : ELF->rels(&Sec)) { + if (R.r_offset == static_cast(IndexTableOffset)) { typename object::ELFFile::Elf_Rela RelA; - RelA.r_offset = RI->r_offset; - RelA.r_info = RI->r_info; + RelA.r_offset = R.r_offset; + RelA.r_info = R.r_info; RelA.r_addend = 0; std::pair Symbol = -- cgit v1.2.3