replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[llvm-cxxdump] Correctly process relocations when given multiple files 

Archive files wouldn't lead to us reprocessing the section relocations
for the new object files.

llvm-svn: 244932
This commit is contained in:
David Majnemer 2015-08-13 18:31:43 +00:00
parent be9b6c75c3
commit d7fafa0ffc
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp
View File

@ -64,20 +64,7 @@ static void reportError(StringRef Input, std::error_code EC) {
reportError(Input, EC.message());
}
static SmallVectorImpl<SectionRef> &getRelocSections(const ObjectFile *Obj,
const SectionRef &Sec) {
static bool MappingDone = false;
static std::map<SectionRef, SmallVector<SectionRef, 1>> SectionRelocMap;
if (!MappingDone) {
for (const SectionRef &Section : Obj->sections()) {
section_iterator Sec2 = Section.getRelocatedSection();
if (Sec2 != Obj->section_end())
SectionRelocMap[*Sec2].push_back(Section);
}
MappingDone = true;
}
return SectionRelocMap[Sec];
}
static std::map<SectionRef, SmallVector<SectionRef, 1>> SectionRelocMap;
static void collectRelocatedSymbols(const ObjectFile *Obj,
const SectionRef &Sec, uint64_t SecAddress,
@ -85,7 +72,7 @@ static void collectRelocatedSymbols(const ObjectFile *Obj,
StringRef *I, StringRef *E) {
uint64_t SymOffset = SymAddress - SecAddress;
uint64_t SymEnd = SymOffset + SymSize;
for (const SectionRef &SR : getRelocSections(Obj, Sec)) {
for (const SectionRef &SR : SectionRelocMap[Sec]) {
for (const object::RelocationRef &Reloc : SR.relocations()) {
if (I == E)
break;
@ -109,7 +96,7 @@ static void collectRelocationOffsets(
std::map<std::pair<StringRef, uint64_t>, StringRef> &Collection) {
uint64_t SymOffset = SymAddress - SecAddress;
uint64_t SymEnd = SymOffset + SymSize;
for (const SectionRef &SR : getRelocSections(Obj, Sec)) {
for (const SectionRef &SR : SectionRelocMap[Sec]) {
for (const object::RelocationRef &Reloc : SR.relocations()) {
const object::symbol_iterator RelocSymI = Reloc.getSymbol();
if (RelocSymI == Obj->symbol_end())
@ -173,6 +160,13 @@ static void dumpCXXData(const ObjectFile *Obj) {
std::map<std::pair<StringRef, uint64_t>, StringRef> VTTEntries;
std::map<StringRef, StringRef> TINames;
SectionRelocMap.clear();
for (const SectionRef &Section : Obj->sections()) {
section_iterator Sec2 = Section.getRelocatedSection();
if (Sec2 != Obj->section_end())
SectionRelocMap[*Sec2].push_back(Section);
}
uint8_t BytesInAddress = Obj->getBytesInAddress();
std::vector<std::pair<SymbolRef, uint64_t>> SymAddr =