From 0faf3930c405c320d8ed210aa0b44ef608e208da Mon Sep 17 00:00:00 2001 From: Georgii Rymar Date: Thu, 3 Sep 2020 17:45:08 +0300 Subject: [PATCH] [llvm-readelf/obj] - Use `RelSymbol` instead of std::pair. NFCI. We have the `RelSymbol` struct and can use it instead of `std::pair` in a few methods. This is a bit cleaner. Differential revision: https://reviews.llvm.org/D87092 --- llvm/tools/llvm-readobj/ELFDumper.cpp | 54 ++++++++++++++------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp index ca0f93cc1d612d..ab8b546a7b7649 100644 --- a/llvm/tools/llvm-readobj/ELFDumper.cpp +++ b/llvm/tools/llvm-readobj/ELFDumper.cpp @@ -114,6 +114,13 @@ namespace { template class DumpStyle; +template struct RelSymbol { + RelSymbol(const typename ELFT::Sym *S, StringRef N) + : Sym(S), Name(N.str()) {} + const typename ELFT::Sym *Sym; + std::string Name; +}; + /// Represents a contiguous uniform range in the file. We cannot just create a /// range directly because when creating one of these from the .dynamic table /// the size, entity size and virtual address are different entries in arbitrary @@ -364,8 +371,8 @@ template class ELFDumper : public ObjDumper { getVersionDependencies(const Elf_Shdr *Sec) const; template - Expected> - getRelocationTarget(const Elf_Shdr *SymTab, const RelTy &R) const; + Expected> getRelocationTarget(const Elf_Shdr *SymTab, + const RelTy &R) const; std::function WarningHandler; void reportUniqueWarning(Error Err) const; @@ -873,8 +880,7 @@ template class GNUStyle : public DumpStyle { void printRelRelaReloc(const RelTy &R, unsigned RelIndex, const Elf_Shdr &Sec, const Elf_Shdr *SymTab); template - void printRelRelaReloc(const Elf_Sym *Sym, StringRef SymbolName, - const RelTy &R); + void printRelRelaReloc(const RelTy &R, const RelSymbol &RelSym); void printSymbol(const Elf_Sym *Symbol, const Elf_Sym *First, Optional StrTable, bool IsDynamic, bool NonVisibilityBitsUsed) override; @@ -1053,7 +1059,7 @@ Expected ELFDumper::getSymbolVersion(const Elf_Sym *Sym, template template -Expected> +Expected> ELFDumper::getRelocationTarget(const Elf_Shdr *SymTab, const RelTy &R) const { const ELFFile *Obj = ObjF->getELFFile(); @@ -1062,7 +1068,7 @@ ELFDumper::getRelocationTarget(const Elf_Shdr *SymTab, return SymOrErr.takeError(); const Elf_Sym *Sym = *SymOrErr; if (!Sym) - return std::make_pair(nullptr, ""); + return RelSymbol(nullptr, ""); // The st_name field of a STT_SECTION is usually 0 (empty string). // This code block returns the section name. @@ -1073,12 +1079,12 @@ ELFDumper::getRelocationTarget(const Elf_Shdr *SymTab, return SecOrErr.takeError(); // A section symbol describes the section at index 0. if (*SecOrErr == nullptr) - return std::make_pair(Sym, ""); + return RelSymbol(Sym, ""); Expected NameOrErr = Obj->getSectionName(*SecOrErr); if (!NameOrErr) return NameOrErr.takeError(); - return std::make_pair(Sym, NameOrErr->str()); + return RelSymbol(Sym, NameOrErr->str()); } Expected StrTableOrErr = Obj->getStringTableForSymtab(*SymTab); @@ -1087,7 +1093,7 @@ ELFDumper::getRelocationTarget(const Elf_Shdr *SymTab, std::string SymbolName = getFullSymbolName(Sym, *StrTableOrErr, SymTab->sh_type == SHT_DYNSYM); - return std::make_pair(Sym, SymbolName); + return RelSymbol(Sym, SymbolName); } static std::string maybeDemangle(StringRef Name) { @@ -3623,14 +3629,14 @@ template void GNUStyle::printRelRelaReloc(const RelTy &R, unsigned RelIndex, const Elf_Shdr &Sec, const Elf_Shdr *SymTab) { - Expected> Target = + Expected> Target = this->dumper()->getRelocationTarget(SymTab, R); if (!Target) this->reportUniqueWarning(createError( "unable to print relocation " + Twine(RelIndex) + " in " + describe(this->Obj, Sec) + ": " + toString(Target.takeError()))); else - printRelRelaReloc(/*Sym=*/Target->first, /*Name=*/Target->second, R); + printRelRelaReloc(R, *Target); } template @@ -3645,8 +3651,8 @@ static Optional getAddend(const typename ELFT::Rel &) { template template -void GNUStyle::printRelRelaReloc(const Elf_Sym *Sym, StringRef SymbolName, - const RelTy &R) { +void GNUStyle::printRelRelaReloc(const RelTy &R, + const RelSymbol &RelSym) { // First two fields are bit width dependent. The rest of them are fixed width. unsigned Bias = ELFT::Is64Bits ? 8 : 0; Field Fields[5] = {0, 10 + Bias, 19 + 2 * Bias, 42 + 2 * Bias, 53 + 2 * Bias}; @@ -3659,17 +3665,18 @@ void GNUStyle::printRelRelaReloc(const Elf_Sym *Sym, StringRef SymbolName, this->Obj.getRelocationTypeName(R.getType(this->Obj.isMips64EL()), RelocName); Fields[2].Str = RelocName.c_str(); - if (Sym) - Fields[3].Str = to_string(format_hex_no_prefix(Sym->getValue(), Width)); + if (RelSym.Sym) + Fields[3].Str = + to_string(format_hex_no_prefix(RelSym.Sym->getValue(), Width)); - Fields[4].Str = std::string(SymbolName); + Fields[4].Str = std::string(RelSym.Name); for (const Field &F : Fields) printField(F); std::string Addend; if (Optional A = getAddend(R)) { int64_t RelAddend = *A; - if (!SymbolName.empty()) { + if (!RelSym.Name.empty()) { if (RelAddend < 0) { Addend = " - "; RelAddend = std::abs(RelAddend); @@ -4349,10 +4356,6 @@ template void GNUStyle::printSectionMapping() { } namespace { -template struct RelSymbol { - const typename ELFT::Sym *Sym; - std::string Name; -}; template RelSymbol getSymbolForReloc(const ELFFile &Obj, StringRef FileName, @@ -4394,9 +4397,8 @@ RelSymbol getSymbolForReloc(const ELFFile &Obj, StringRef FileName, template template void GNUStyle::printDynamicRelocation(const RelTy &R) { - RelSymbol S = - getSymbolForReloc(this->Obj, this->FileName, this->dumper(), R); - printRelRelaReloc(S.Sym, S.Name, R); + printRelRelaReloc( + R, getSymbolForReloc(this->Obj, this->FileName, this->dumper(), R)); } template @@ -6169,7 +6171,7 @@ template void LLVMStyle::printRelRelaReloc(const RelTy &Rel, unsigned RelIndex, const Elf_Shdr &Sec, const Elf_Shdr *SymTab) { - Expected> Target = + Expected> Target = this->dumper()->getRelocationTarget(SymTab, Rel); if (!Target) { this->reportUniqueWarning(createError( @@ -6178,7 +6180,7 @@ void LLVMStyle::printRelRelaReloc(const RelTy &Rel, unsigned RelIndex, return; } - std::string TargetName = Target->second; + std::string TargetName = Target->Name; SmallString<32> RelocName; this->Obj.getRelocationTypeName(Rel.getType(this->Obj.isMips64EL()), RelocName);