From 776f86420e7b89dd33414a34310dcbf246feefeb Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 19 Jun 2015 17:54:28 +0000 Subject: [PATCH] Make getRelocationSection MachO only. There are 3 types of relocations on MachO * Scattered * Section based * Symbol based On ELF and COFF relocations are symbol based. We were in the strange situation that we abstracted over two of them. This makes section based relocations MachO only. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240149 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/COFF.h | 1 - include/llvm/Object/ELFObjectFile.h | 15 --------------- include/llvm/Object/MachO.h | 2 +- include/llvm/Object/ObjectFile.h | 6 ------ lib/DebugInfo/DWARF/DWARFContext.cpp | 9 +++++++-- lib/Object/COFFObjectFile.cpp | 13 ------------- tools/llvm-readobj/MachODumper.cpp | 2 +- 7 files changed, 9 insertions(+), 39 deletions(-) diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h index 564eb7a7a9c..ad657b591fb 100644 --- a/include/llvm/Object/COFF.h +++ b/include/llvm/Object/COFF.h @@ -641,7 +641,6 @@ protected: std::error_code getRelocationOffset(DataRefImpl Rel, uint64_t &Res) const override; symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override; - section_iterator getRelocationSection(DataRefImpl Rel) const override; std::error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const override; std::error_code diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h index 45e6f749c1f..a85fbd8701c 100644 --- a/include/llvm/Object/ELFObjectFile.h +++ b/include/llvm/Object/ELFObjectFile.h @@ -112,7 +112,6 @@ protected: std::error_code getRelocationOffset(DataRefImpl Rel, uint64_t &Res) const override; symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override; - section_iterator getRelocationSection(DataRefImpl Rel) const override; std::error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const override; std::error_code @@ -584,20 +583,6 @@ ELFObjectFile::getRelocationSymbol(DataRefImpl Rel) const { return symbol_iterator(SymbolRef(SymbolData, this)); } -// ELF relocations can target sections, by targetting a symbol of type -// STT_SECTION -template -section_iterator -ELFObjectFile::getRelocationSection(DataRefImpl Rel) const { - symbol_iterator Sym = getRelocationSymbol(Rel); - if (Sym == symbol_end()) - return section_end(); - const Elf_Sym *ESym = getSymbol(Sym->getRawDataRefImpl()); - if (ESym->getType() != ELF::STT_SECTION) - return section_end(); - return getSymbolSection(ESym); -} - template std::error_code ELFObjectFile::getRelocationAddress(DataRefImpl Rel, diff --git a/include/llvm/Object/MachO.h b/include/llvm/Object/MachO.h index 72db49aac98..4350a759f15 100644 --- a/include/llvm/Object/MachO.h +++ b/include/llvm/Object/MachO.h @@ -236,7 +236,7 @@ public: std::error_code getRelocationOffset(DataRefImpl Rel, uint64_t &Res) const override; symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override; - section_iterator getRelocationSection(DataRefImpl Rel) const override; + section_iterator getRelocationSection(DataRefImpl Rel) const; std::error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const override; std::error_code diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h index a1ae19ecdfe..e00fe0ed0a2 100644 --- a/include/llvm/Object/ObjectFile.h +++ b/include/llvm/Object/ObjectFile.h @@ -53,7 +53,6 @@ public: std::error_code getAddress(uint64_t &Result) const; std::error_code getOffset(uint64_t &Result) const; symbol_iterator getSymbol() const; - section_iterator getSection() const; std::error_code getType(uint64_t &Result) const; /// @brief Indicates whether this relocation should hidden when listing @@ -241,7 +240,6 @@ protected: virtual std::error_code getRelocationOffset(DataRefImpl Rel, uint64_t &Res) const = 0; virtual symbol_iterator getRelocationSymbol(DataRefImpl Rel) const = 0; - virtual section_iterator getRelocationSection(DataRefImpl Rel) const = 0; virtual std::error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const = 0; virtual std::error_code @@ -459,10 +457,6 @@ inline symbol_iterator RelocationRef::getSymbol() const { return OwningObject->getRelocationSymbol(RelocationPimpl); } -inline section_iterator RelocationRef::getSection() const { - return OwningObject->getRelocationSection(RelocationPimpl); -} - inline std::error_code RelocationRef::getType(uint64_t &Result) const { return OwningObject->getRelocationType(RelocationPimpl, Result); } diff --git a/lib/DebugInfo/DWARF/DWARFContext.cpp b/lib/DebugInfo/DWARF/DWARFContext.cpp index baab3873b91..32654f830f0 100644 --- a/lib/DebugInfo/DWARF/DWARFContext.cpp +++ b/lib/DebugInfo/DWARF/DWARFContext.cpp @@ -674,7 +674,7 @@ DWARFContextInMemory::DWARFContextInMemory(const object::ObjectFile &Obj, uint64_t SymAddr = 0; uint64_t SectionLoadAddress = 0; object::symbol_iterator Sym = Reloc.getSymbol(); - object::section_iterator RSec = Reloc.getSection(); + object::section_iterator RSec = Obj.section_end(); // First calculate the address of the symbol or section as it appears // in the objct file @@ -682,8 +682,13 @@ DWARFContextInMemory::DWARFContextInMemory(const object::ObjectFile &Obj, Sym->getAddress(SymAddr); // Also remember what section this symbol is in for later Sym->getSection(RSec); - } else if (RSec != Obj.section_end()) + } else if (auto *MObj = dyn_cast(&Obj)) { + // MachO also has relocations that point to sections and + // scattered relocations. + // FIXME: We are not handling scattered relocations, do we have to? + RSec = MObj->getRelocationSection(Reloc.getRawDataRefImpl()); SymAddr = RSec->getAddress(); + } // If we are given load addresses for the sections, we need to adjust: // SymAddr = (Address of Symbol Or Section in File) - diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index 1055b987d7e..e2f559eec72 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -991,19 +991,6 @@ symbol_iterator COFFObjectFile::getRelocationSymbol(DataRefImpl Rel) const { return symbol_iterator(SymbolRef(Ref, this)); } -section_iterator COFFObjectFile::getRelocationSection(DataRefImpl Rel) const { - symbol_iterator Sym = getRelocationSymbol(Rel); - if (Sym == symbol_end()) - return section_end(); - COFFSymbolRef Symb = getCOFFSymbol(*Sym); - if (!Symb.isSection()) - return section_end(); - section_iterator Res(section_end()); - if (getSymbolSection(Sym->getRawDataRefImpl(),Res)) - return section_end(); - return Res; -} - std::error_code COFFObjectFile::getRelocationType(DataRefImpl Rel, uint64_t &Res) const { const coff_relocation* R = toRel(Rel); diff --git a/tools/llvm-readobj/MachODumper.cpp b/tools/llvm-readobj/MachODumper.cpp index 9017350c403..aeb563a25ff 100644 --- a/tools/llvm-readobj/MachODumper.cpp +++ b/tools/llvm-readobj/MachODumper.cpp @@ -479,7 +479,7 @@ void MachODumper::printRelocation(const MachOObjectFile *Obj, return; } } else if (!IsScattered) { - section_iterator SecI = Reloc.getSection(); + section_iterator SecI = Obj->getRelocationSection(DR); if (SecI != Obj->section_end()) { if (error(SecI->getName(TargetName))) return;