From a3af347f38956c1bb7a539c3af131c41fc2d2d01 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 24 Jun 2015 19:57:32 +0000 Subject: [PATCH] Make computeSymbolSizes never fail. On ELF that was already the case since getting the size of a symbol never fails. On MachO and COFF we could fail trying to get the section of a symbol. But we don't really need the section, just the section number to know if two symbols are in the same section or not. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240580 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/COFF.h | 2 ++ include/llvm/Object/MachO.h | 2 ++ include/llvm/Object/SymbolSize.h | 2 +- lib/Object/COFFObjectFile.cpp | 12 +++++++++ lib/Object/MachOObjectFile.cpp | 10 ++++++++ lib/Object/SymbolSize.cpp | 38 +++++++++++++++++------------ tools/llvm-cxxdump/llvm-cxxdump.cpp | 6 ++--- tools/llvm-rtdyld/llvm-rtdyld.cpp | 6 ++--- 8 files changed, 54 insertions(+), 24 deletions(-) diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h index 3432f630dea..6755ae0333b 100644 --- a/include/llvm/Object/COFF.h +++ b/include/llvm/Object/COFF.h @@ -681,6 +681,8 @@ public: COFFSymbolRef getCOFFSymbol(const DataRefImpl &Ref) const; COFFSymbolRef getCOFFSymbol(const SymbolRef &Symbol) const; const coff_relocation *getCOFFRelocation(const RelocationRef &Reloc) const; + unsigned getSectionID(SectionRef Sec) const; + unsigned getSymbolSectionID(SymbolRef Sym) const; uint8_t getBytesInAddress() const override; StringRef getFileFormatName() const override; diff --git a/include/llvm/Object/MachO.h b/include/llvm/Object/MachO.h index a2979699447..ea1b6313212 100644 --- a/include/llvm/Object/MachO.h +++ b/include/llvm/Object/MachO.h @@ -216,6 +216,8 @@ public: uint32_t getSymbolFlags(DataRefImpl Symb) const override; std::error_code getSymbolSection(DataRefImpl Symb, section_iterator &Res) const override; + unsigned getSymbolSectionID(SymbolRef Symb) const; + unsigned getSectionID(SectionRef Sec) const; void moveSectionNext(DataRefImpl &Sec) const override; std::error_code getSectionName(DataRefImpl Sec, diff --git a/include/llvm/Object/SymbolSize.h b/include/llvm/Object/SymbolSize.h index b461c94c44b..f2ce70f4208 100644 --- a/include/llvm/Object/SymbolSize.h +++ b/include/llvm/Object/SymbolSize.h @@ -15,7 +15,7 @@ namespace llvm { namespace object { -ErrorOr>> +std::vector> computeSymbolSizes(const ObjectFile &O); } } // namespace llvm diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index 07f9d6ed232..797ee1a7cda 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -258,6 +258,11 @@ COFFObjectFile::getSymbolSection(DataRefImpl Ref, return std::error_code(); } +unsigned COFFObjectFile::getSymbolSectionID(SymbolRef Sym) const { + COFFSymbolRef Symb = getCOFFSymbol(Sym.getRawDataRefImpl()); + return Symb.getSectionNumber(); +} + void COFFObjectFile::moveSectionNext(DataRefImpl &Ref) const { const coff_section *Sec = toSec(Ref); Sec += 1; @@ -311,6 +316,13 @@ bool COFFObjectFile::isSectionBSS(DataRefImpl Ref) const { return (Sec->Characteristics & BssFlags) == BssFlags; } +unsigned COFFObjectFile::getSectionID(SectionRef Sec) const { + uintptr_t Offset = + uintptr_t(Sec.getRawDataRefImpl().p) - uintptr_t(SectionTable); + assert((Offset % sizeof(coff_section)) == 0); + return (Offset / sizeof(coff_section)) + 1; +} + bool COFFObjectFile::isSectionVirtual(DataRefImpl Ref) const { const coff_section *Sec = toSec(Ref); // In COFF, a virtual section won't have any in-file diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index cb98f05bfcc..62a0d60f338 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -483,6 +483,12 @@ std::error_code MachOObjectFile::getSymbolSection(DataRefImpl Symb, return std::error_code(); } +unsigned MachOObjectFile::getSymbolSectionID(SymbolRef Sym) const { + MachO::nlist_base Entry = + getSymbolTableEntryBase(this, Sym.getRawDataRefImpl()); + return Entry.n_sect - 1; +} + void MachOObjectFile::moveSectionNext(DataRefImpl &Sec) const { Sec.d.a++; } @@ -559,6 +565,10 @@ bool MachOObjectFile::isSectionBSS(DataRefImpl Sec) const { SectionType == MachO::S_GB_ZEROFILL); } +unsigned MachOObjectFile::getSectionID(SectionRef Sec) const { + return Sec.getRawDataRefImpl().d.a; +} + bool MachOObjectFile::isSectionVirtual(DataRefImpl Sec) const { // FIXME: Unimplemented. return false; diff --git a/lib/Object/SymbolSize.cpp b/lib/Object/SymbolSize.cpp index 2da71f1fa24..276deaaddd7 100644 --- a/lib/Object/SymbolSize.cpp +++ b/lib/Object/SymbolSize.cpp @@ -9,7 +9,9 @@ #include "llvm/Object/SymbolSize.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/Object/COFF.h" #include "llvm/Object/ELFObjectFile.h" +#include "llvm/Object/MachO.h" using namespace llvm; using namespace object; @@ -19,25 +21,33 @@ struct SymEntry { symbol_iterator I; uint64_t Address; unsigned Number; - SectionRef Section; + unsigned SectionID; }; } static int compareAddress(const SymEntry *A, const SymEntry *B) { - if (A->Section == B->Section) - return A->Address - B->Address; - if (A->Section < B->Section) - return -1; - if (A->Section == B->Section) - return 0; - return 1; + if (A->SectionID != B->SectionID) + return A->SectionID - B->SectionID; + return A->Address - B->Address; } static int compareNumber(const SymEntry *A, const SymEntry *B) { return A->Number - B->Number; } -ErrorOr>> +static unsigned getSectionID(const ObjectFile &O, SectionRef Sec) { + if (auto *M = dyn_cast(&O)) + return M->getSectionID(Sec); + return cast(O).getSectionID(Sec); +} + +static unsigned getSymbolSectionID(const ObjectFile &O, SymbolRef Sym) { + if (auto *M = dyn_cast(&O)) + return M->getSymbolSectionID(Sym); + return cast(O).getSymbolSectionID(Sym); +} + +std::vector> llvm::object::computeSymbolSizes(const ObjectFile &O) { std::vector> Ret; @@ -54,16 +64,14 @@ llvm::object::computeSymbolSizes(const ObjectFile &O) { for (symbol_iterator I = O.symbol_begin(), E = O.symbol_end(); I != E; ++I) { SymbolRef Sym = *I; uint64_t Value = Sym.getValue(); - section_iterator SecI = O.section_end(); - if (std::error_code EC = Sym.getSection(SecI)) - return EC; - Addresses.push_back({I, Value, SymNum, *SecI}); + Addresses.push_back({I, Value, SymNum, getSymbolSectionID(O, Sym)}); ++SymNum; } - for (const SectionRef Sec : O.sections()) { + for (SectionRef Sec : O.sections()) { uint64_t Address = Sec.getAddress(); uint64_t Size = Sec.getSize(); - Addresses.push_back({O.symbol_end(), Address + Size, 0, Sec}); + Addresses.push_back( + {O.symbol_end(), Address + Size, 0, getSectionID(O, Sec)}); } array_pod_sort(Addresses.begin(), Addresses.end(), compareAddress); diff --git a/tools/llvm-cxxdump/llvm-cxxdump.cpp b/tools/llvm-cxxdump/llvm-cxxdump.cpp index bd9cf7d5df2..e4d32abb95c 100644 --- a/tools/llvm-cxxdump/llvm-cxxdump.cpp +++ b/tools/llvm-cxxdump/llvm-cxxdump.cpp @@ -188,12 +188,10 @@ static void dumpCXXData(const ObjectFile *Obj) { uint8_t BytesInAddress = Obj->getBytesInAddress(); - ErrorOr>> SymAddrOrErr = + std::vector> SymAddr = object::computeSymbolSizes(*Obj); - if (error(SymAddrOrErr.getError())) - return; - for (auto &P : *SymAddrOrErr) { + for (auto &P : SymAddr) { object::SymbolRef Sym = P.first; uint64_t SymSize = P.second; StringRef SymName; diff --git a/tools/llvm-rtdyld/llvm-rtdyld.cpp b/tools/llvm-rtdyld/llvm-rtdyld.cpp index addea588472..65033a2e0cc 100644 --- a/tools/llvm-rtdyld/llvm-rtdyld.cpp +++ b/tools/llvm-rtdyld/llvm-rtdyld.cpp @@ -259,13 +259,11 @@ static int printLineInfoForInput(bool LoadObjects, bool UseDebugObj) { std::unique_ptr Context( new DWARFContextInMemory(*SymbolObj,LoadedObjInfo.get())); - ErrorOr>> SymAddrOrErr = + std::vector> SymAddr = object::computeSymbolSizes(*SymbolObj); - if (std::error_code EC = SymAddrOrErr.getError()) - return Error(EC.message()); // Use symbol info to iterate functions in the object. - for (const auto &P : *SymAddrOrErr) { + for (const auto &P : SymAddr) { object::SymbolRef Sym = P.first; object::SymbolRef::Type SymType; if (Sym.getType(SymType))