RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 11:13:28 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-readobj] - Refactor the code that dumps relocations.

Browse Source 
The current code has following issues:
1) It has a duplicated logic part.
2) This logic relies on unwrapOrError calls, but if we want to convert
   them to warnings, we will need to change all of them what is hard to do
   because of the duplication.

In this patch I've created a new method that returns Expected<> what allows
now to catch all errors in a single place and remove the code duplication.

Note: this change is itself a refactor NFC. It does not change the current logic
anyhow. It prepares the code for the follow-up(s).

Differential revision: https://reviews.llvm.org/D74545
This commit is contained in:
Georgii Rymar 2020-02-13 15:12:31 +03:00
parent 0c3be93d04
commit 86793686ea
1 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
tools/llvm-readobj/ELFDumper.cpp
View File

@ -362,6 +362,9 @@ public:
getVersionDefinitions(const Elf_Shdr *Sec) const;
Expected<std::vector<VerNeed>>
getVersionDependencies(const Elf_Shdr *Sec) const;
Expected<std::pair<const Elf_Sym *, std::string>>
getRelocationTarget(const Elf_Shdr *SymTab, const Elf_Rela &R) const;
};
template <class ELFT>
@ -1050,6 +1053,41 @@ Expected<StringRef> ELFDumper<ELFT>::getSymbolVersion(const Elf_Sym *Sym,
return this->getSymbolVersionByIndex(Versym->vs_index, IsDefault);
}
template <typename ELFT>
Expected<std::pair<const typename ELFT::Sym *, std::string>>
ELFDumper<ELFT>::getRelocationTarget(const Elf_Shdr *SymTab,
const Elf_Rela &R) const {
const ELFFile<ELFT> *Obj = ObjF->getELFFile();
Expected<const Elf_Sym *> SymOrErr = Obj->getRelocationSymbol(&R, SymTab);
if (!SymOrErr)
return SymOrErr.takeError();
const Elf_Sym *Sym = *SymOrErr;
if (!Sym)
return std::make_pair(nullptr, "");
// The st_name field of a STT_SECTION is usually 0 (empty string).
// This code block returns the section name.
if (Sym->getType() == ELF::STT_SECTION) {
Expected<const Elf_Shdr *> SecOrErr =
Obj->getSection(Sym, SymTab, ShndxTable);
if (!SecOrErr)
return SecOrErr.takeError();
Expected<StringRef> NameOrErr = Obj->getSectionName(*SecOrErr);
if (!NameOrErr)
return NameOrErr.takeError();
return std::make_pair(Sym, NameOrErr->str());
}
Expected<StringRef> StrTableOrErr = Obj->getStringTableForSymtab(*SymTab);
if (!StrTableOrErr)
return StrTableOrErr.takeError();
std::string SymbolName =
getFullSymbolName(Sym, *StrTableOrErr, SymTab->sh_type == SHT_DYNSYM);
return std::make_pair(Sym, SymbolName);
}
static std::string maybeDemangle(StringRef Name) {
return opts::Demangle ? demangle(std::string(Name)) : Name.str();
}
@ -3281,22 +3319,11 @@ template <class ELFT> void GNUStyle<ELFT>::printGroupSections(const ELFO *Obj) {
template <class ELFT>
void GNUStyle<ELFT>::printRelocation(const ELFO *Obj, const Elf_Shdr *SymTab,
const Elf_Rela &R, bool IsRela) {
const Elf_Sym *Sym =
unwrapOrError(this->FileName, Obj->getRelocationSymbol(&R, SymTab));
std::string TargetName;
if (Sym && Sym->getType() == ELF::STT_SECTION) {
const Elf_Shdr *Sec = unwrapOrError(
this->FileName,
Obj->getSection(Sym, SymTab, this->dumper()->getShndxTable()));
TargetName =
std::string(unwrapOrError(this->FileName, Obj->getSectionName(Sec)));
} else if (Sym) {
StringRef StrTable =
unwrapOrError(this->FileName, Obj->getStringTableForSymtab(*SymTab));
TargetName = this->dumper()->getFullSymbolName(
Sym, StrTable, SymTab->sh_type == SHT_DYNSYM /* IsDynamic */);
}
printRelocation(Obj, Sym, TargetName, R, IsRela);
const typename ELFT::Sym *Sym;
std::string Name;
std::tie(Sym, Name) = unwrapOrError(
this->FileName, this->dumper()->getRelocationTarget(SymTab, R));
printRelocation(Obj, Sym, Name, R, IsRela);
}
template <class ELFT>
@ -5709,23 +5736,13 @@ void LLVMStyle<ELFT>::printRelocations(const Elf_Shdr *Sec, const ELFO *Obj) {
template <class ELFT>
void LLVMStyle<ELFT>::printRelocation(const ELFO *Obj, Elf_Rela Rel,
const Elf_Shdr *SymTab) {
std::string TargetName =
unwrapOrError(this->FileName,
this->dumper()->getRelocationTarget(SymTab, Rel))
.second;
SmallString<32> RelocName;
Obj->getRelocationTypeName(Rel.getType(Obj->isMips64EL()), RelocName);
std::string TargetName;
const Elf_Sym *Sym =
unwrapOrError(this->FileName, Obj->getRelocationSymbol(&Rel, SymTab));
if (Sym && Sym->getType() == ELF::STT_SECTION) {
const Elf_Shdr *Sec = unwrapOrError(
this->FileName,
Obj->getSection(Sym, SymTab, this->dumper()->getShndxTable()));
TargetName =
std::string(unwrapOrError(this->FileName, Obj->getSectionName(Sec)));
} else if (Sym) {
StringRef StrTable =
unwrapOrError(this->FileName, Obj->getStringTableForSymtab(*SymTab));
TargetName = this->dumper()->getFullSymbolName(
Sym, StrTable, SymTab->sh_type == SHT_DYNSYM /* IsDynamic */);
}
if (opts::ExpandRelocs) {
DictScope Group(W, "Relocation");