[llvm] r357165 - - Addressed @jhenderson 's comments
Xing GUO via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 28 05:51:46 PDT 2019
Author: higuoxing
Date: Thu Mar 28 05:51:46 2019
New Revision: 357165
URL: http://llvm.org/viewvc/llvm-project?rev=357165&view=rev
Log:
- Addressed @jhenderson 's comments
- Format patch
Modified:
llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
Modified: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/ELFDumper.cpp?rev=357165&r1=357164&r2=357165&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp Thu Mar 28 05:51:46 2019
@@ -274,9 +274,9 @@ public:
StringRef &SectionName,
unsigned &SectionIndex) const;
std::string getStaticSymbolName(uint32_t Index) const;
- std::string getSymbolVersionByIndex(StringRef StrTab,
- const uint32_t VersionSymbolIndex,
- bool &IsDefault) const;
+ StringRef getSymbolVersionByIndex(StringRef StrTab,
+ uint32_t VersionSymbolIndex,
+ bool &IsDefault) const;
void printSymbolsHelper(bool IsDynamic) const;
const Elf_Shdr *getDotSymtabSec() const { return DotSymtabSec; }
@@ -644,12 +644,11 @@ StringRef ELFDumper<ELFT>::getSymbolVers
reinterpret_cast<uintptr_t>(DynSymRegion.Addr)) /
sizeof(Elf_Sym);
- // Get the corresponding version index entry
+ // Get the corresponding version index entry.
const Elf_Versym *Versym =
unwrapOrError(ObjF->getELFFile()->template getEntry<Elf_Versym>(
dot_gnu_version_sec, EntryIndex));
- return StringRef(
- this->getSymbolVersionByIndex(StrTab, Versym->vs_index, IsDefault));
+ return this->getSymbolVersionByIndex(StrTab, Versym->vs_index, IsDefault);
}
static std::string maybeDemangle(StringRef Name) {
@@ -668,24 +667,24 @@ std::string ELFDumper<ELFT>::getStaticSy
}
template <typename ELFT>
-std::string ELFDumper<ELFT>::getSymbolVersionByIndex(
- StringRef StrTab, const uint32_t SymbolVersionIndex, bool &IsDefault) const {
+StringRef ELFDumper<ELFT>::getSymbolVersionByIndex(
+ StringRef StrTab, uint32_t SymbolVersionIndex, bool &IsDefault) const {
size_t VersionIndex = SymbolVersionIndex & VERSYM_VERSION;
// Special markers for unversioned symbols.
if (VersionIndex == VER_NDX_LOCAL ||
VersionIndex == VER_NDX_GLOBAL) {
IsDefault = false;
- return "";
+ return StringRef("");
}
- // Lookup this symbol in the version table
+ // Lookup this symbol in the version table.
LoadVersionMap();
if (VersionIndex >= VersionMap.size() || VersionMap[VersionIndex].isNull())
reportError("Invalid version entry");
const VersionMapEntry &Entry = VersionMap[VersionIndex];
- // Get the version name string
+ // Get the version name string.
size_t NameOffset;
if (Entry.isVerdef()) {
// The first Verdaux entry holds the name.
@@ -697,7 +696,7 @@ std::string ELFDumper<ELFT>::getSymbolVe
}
if (NameOffset >= StrTab.size())
reportError("Invalid string offset");
- return std::string(StrTab.data() + NameOffset);
+ return StringRef(StrTab.data() + NameOffset);
}
template <typename ELFT>
More information about the llvm-commits
mailing list