From: Rafael Espindola <rafael.espindola@gmail.com> Date: Thu, 3 Nov 2016 12:23:41 +0000 (+0000) Subject: Split getSHNDXTable in two. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdc348bc665d722cb82ffe75cde00b30b810880c;p=llvm Split getSHNDXTable in two. Some clients already have the section table available. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@285898 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h index 71e27042af9..48120a30f4d 100644 --- a/include/llvm/Object/ELF.h +++ b/include/llvm/Object/ELF.h @@ -81,6 +81,8 @@ public: ErrorOr<StringRef> getStringTableForSymtab(const Elf_Shdr &Section) const; ErrorOr<ArrayRef<Elf_Word>> getSHNDXTable(const Elf_Shdr &Section) const; + ErrorOr<ArrayRef<Elf_Word>> getSHNDXTable(const Elf_Shdr &Section, + Elf_Shdr_Range Sections) const; void VerifyStrTab(const Elf_Shdr *sh) const; @@ -423,12 +425,23 @@ ELFFile<ELFT>::getStringTable(const Elf_Shdr *Section) const { template <class ELFT> ErrorOr<ArrayRef<typename ELFT::Word>> ELFFile<ELFT>::getSHNDXTable(const Elf_Shdr &Section) const { + auto SectionsOrErr = sections(); + if (std::error_code EC = SectionsOrErr.getError()) + return EC; + return getSHNDXTable(Section, *SectionsOrErr); +} + +template <class ELFT> +ErrorOr<ArrayRef<typename ELFT::Word>> +ELFFile<ELFT>::getSHNDXTable(const Elf_Shdr &Section, + Elf_Shdr_Range Sections) const { assert(Section.sh_type == ELF::SHT_SYMTAB_SHNDX); auto VOrErr = getSectionContentsAsArray<Elf_Word>(&Section); if (std::error_code EC = VOrErr.getError()) return EC; ArrayRef<Elf_Word> V = *VOrErr; - ErrorOr<const Elf_Shdr *> SymTableOrErr = getSection(Section.sh_link); + ErrorOr<const Elf_Shdr *> SymTableOrErr = + object::getSection<ELFT>(Sections, Section.sh_link); if (std::error_code EC = SymTableOrErr.getError()) return EC; const Elf_Shdr &SymTable = **SymTableOrErr;