[llvm] r240580 - Make computeSymbolSizes never fail.
Rafael Espindola
rafael.espindola at gmail.com
Wed Jun 24 12:57:32 PDT 2015
Author: rafael
Date: Wed Jun 24 14:57:32 2015
New Revision: 240580
URL: http://llvm.org/viewvc/llvm-project?rev=240580&view=rev
Log:
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.
Modified:
llvm/trunk/include/llvm/Object/COFF.h
llvm/trunk/include/llvm/Object/MachO.h
llvm/trunk/include/llvm/Object/SymbolSize.h
llvm/trunk/lib/Object/COFFObjectFile.cpp
llvm/trunk/lib/Object/MachOObjectFile.cpp
llvm/trunk/lib/Object/SymbolSize.cpp
llvm/trunk/tools/llvm-cxxdump/llvm-cxxdump.cpp
llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp
Modified: llvm/trunk/include/llvm/Object/COFF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFF.h?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/COFF.h (original)
+++ llvm/trunk/include/llvm/Object/COFF.h Wed Jun 24 14:57:32 2015
@@ -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;
Modified: llvm/trunk/include/llvm/Object/MachO.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/MachO.h (original)
+++ llvm/trunk/include/llvm/Object/MachO.h Wed Jun 24 14:57:32 2015
@@ -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,
Modified: llvm/trunk/include/llvm/Object/SymbolSize.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/SymbolSize.h?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/SymbolSize.h (original)
+++ llvm/trunk/include/llvm/Object/SymbolSize.h Wed Jun 24 14:57:32 2015
@@ -15,7 +15,7 @@
namespace llvm {
namespace object {
-ErrorOr<std::vector<std::pair<SymbolRef, uint64_t>>>
+std::vector<std::pair<SymbolRef, uint64_t>>
computeSymbolSizes(const ObjectFile &O);
}
} // namespace llvm
Modified: llvm/trunk/lib/Object/COFFObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFObjectFile.cpp?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/lib/Object/COFFObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/COFFObjectFile.cpp Wed Jun 24 14:57:32 2015
@@ -258,6 +258,11 @@ COFFObjectFile::getSymbolSection(DataRef
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(DataRe
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
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Wed Jun 24 14:57:32 2015
@@ -483,6 +483,12 @@ std::error_code MachOObjectFile::getSymb
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(DataR
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;
Modified: llvm/trunk/lib/Object/SymbolSize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/SymbolSize.cpp?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/lib/Object/SymbolSize.cpp (original)
+++ llvm/trunk/lib/Object/SymbolSize.cpp Wed Jun 24 14:57:32 2015
@@ -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<std::vector<std::pair<SymbolRef, uint64_t>>>
+static unsigned getSectionID(const ObjectFile &O, SectionRef Sec) {
+ if (auto *M = dyn_cast<MachOObjectFile>(&O))
+ return M->getSectionID(Sec);
+ return cast<COFFObjectFile>(O).getSectionID(Sec);
+}
+
+static unsigned getSymbolSectionID(const ObjectFile &O, SymbolRef Sym) {
+ if (auto *M = dyn_cast<MachOObjectFile>(&O))
+ return M->getSymbolSectionID(Sym);
+ return cast<COFFObjectFile>(O).getSymbolSectionID(Sym);
+}
+
+std::vector<std::pair<SymbolRef, uint64_t>>
llvm::object::computeSymbolSizes(const ObjectFile &O) {
std::vector<std::pair<SymbolRef, uint64_t>> Ret;
@@ -54,16 +64,14 @@ llvm::object::computeSymbolSizes(const 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);
Modified: llvm/trunk/tools/llvm-cxxdump/llvm-cxxdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cxxdump/llvm-cxxdump.cpp?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cxxdump/llvm-cxxdump.cpp (original)
+++ llvm/trunk/tools/llvm-cxxdump/llvm-cxxdump.cpp Wed Jun 24 14:57:32 2015
@@ -188,12 +188,10 @@ static void dumpCXXData(const ObjectFile
uint8_t BytesInAddress = Obj->getBytesInAddress();
- ErrorOr<std::vector<std::pair<SymbolRef, uint64_t>>> SymAddrOrErr =
+ std::vector<std::pair<SymbolRef, uint64_t>> 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;
Modified: llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp?rev=240580&r1=240579&r2=240580&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp (original)
+++ llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp Wed Jun 24 14:57:32 2015
@@ -259,13 +259,11 @@ static int printLineInfoForInput(bool Lo
std::unique_ptr<DIContext> Context(
new DWARFContextInMemory(*SymbolObj,LoadedObjInfo.get()));
- ErrorOr<std::vector<std::pair<SymbolRef, uint64_t>>> SymAddrOrErr =
+ std::vector<std::pair<SymbolRef, uint64_t>> 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))
More information about the llvm-commits
mailing list