[llvm] b62e3a7 - Replace to_hexString by touhexstr [NFC]
Corentin Jabot via llvm-commits
llvm-commits at lists.llvm.org
Thu Jun 16 08:30:18 PDT 2022
Author: Corentin Jabot
Date: 2022-06-16T17:29:50+02:00
New Revision: b62e3a73e170a58dcf5503d74ba7c6fc8ec4c0ab
URL: https://github.com/llvm/llvm-project/commit/b62e3a73e170a58dcf5503d74ba7c6fc8ec4c0ab
DIFF: https://github.com/llvm/llvm-project/commit/b62e3a73e170a58dcf5503d74ba7c6fc8ec4c0ab.diff
LOG: Replace to_hexString by touhexstr [NFC]
LLVM had 2 methods to convert a number to an hexa string,
this remove one of them.
Differential Revision: https://reviews.llvm.org/D127958
Added:
Modified:
lld/MachO/ConcatOutputSection.cpp
llvm/include/llvm/Support/ScopedPrinter.h
llvm/lib/Support/ScopedPrinter.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
llvm/tools/llvm-profgen/PerfReader.cpp
llvm/tools/llvm-readobj/ELFDumper.cpp
Removed:
################################################################################
diff --git a/lld/MachO/ConcatOutputSection.cpp b/lld/MachO/ConcatOutputSection.cpp
index ed709a30ade4d..e97f1e9b9ddd1 100644
--- a/lld/MachO/ConcatOutputSection.cpp
+++ b/lld/MachO/ConcatOutputSection.cpp
@@ -186,10 +186,10 @@ uint64_t TextOutputSection::estimateStubsInRangeVA(size_t callIdx) const {
log("thunks = " + std::to_string(thunkMap.size()) +
", potential = " + std::to_string(maxPotentialThunks) +
", stubs = " + std::to_string(in.stubs->getSize()) + ", isecVA = " +
- to_hexString(isecVA) + ", threshold = " + to_hexString(stubsInRangeVA) +
- ", isecEnd = " + to_hexString(isecEnd) +
- ", tail = " + to_hexString(isecEnd - isecVA) +
- ", slop = " + to_hexString(forwardBranchRange - (isecEnd - isecVA)));
+ utohexstr(isecVA) + ", threshold = " + utohexstr(stubsInRangeVA) +
+ ", isecEnd = " + utohexstr(isecEnd) +
+ ", tail = " + utohexstr(isecEnd - isecVA) +
+ ", slop = " + utohexstr(forwardBranchRange - (isecEnd - isecVA)));
return stubsInRangeVA;
}
diff --git a/llvm/include/llvm/Support/ScopedPrinter.h b/llvm/include/llvm/Support/ScopedPrinter.h
index fb26dd6cc3a3b..c9eabfb3788c0 100644
--- a/llvm/include/llvm/Support/ScopedPrinter.h
+++ b/llvm/include/llvm/Support/ScopedPrinter.h
@@ -81,7 +81,6 @@ struct FlagEntry {
};
raw_ostream &operator<<(raw_ostream &OS, const HexNumber &Value);
-std::string to_hexString(uint64_t Value, bool UpperCase = true);
template <class T> std::string to_string(const T &Value) {
std::string number;
@@ -95,7 +94,7 @@ std::string enumToString(T Value, ArrayRef<EnumEntry<TEnum>> EnumValues) {
for (const EnumEntry<TEnum> &EnumItem : EnumValues)
if (EnumItem.Value == Value)
return std::string(EnumItem.AltName);
- return to_hexString(Value, false);
+ return utohexstr(Value, true);
}
class ScopedPrinter {
diff --git a/llvm/lib/Support/ScopedPrinter.cpp b/llvm/lib/Support/ScopedPrinter.cpp
index a434e50e8c1fb..ef6dd5fdf1d6c 100644
--- a/llvm/lib/Support/ScopedPrinter.cpp
+++ b/llvm/lib/Support/ScopedPrinter.cpp
@@ -7,17 +7,10 @@ using namespace llvm::support;
namespace llvm {
raw_ostream &operator<<(raw_ostream &OS, const HexNumber &Value) {
- OS << "0x" << to_hexString(Value.Value);
+ OS << "0x" << utohexstr(Value.Value);
return OS;
}
-std::string to_hexString(uint64_t Value, bool UpperCase) {
- std::string number;
- llvm::raw_string_ostream stream(number);
- stream << format_hex_no_prefix(Value, 1, UpperCase);
- return stream.str();
-}
-
void ScopedPrinter::printBinaryImpl(StringRef Label, StringRef Str,
ArrayRef<uint8_t> Data, bool Block,
uint32_t StartOffset) {
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
index ed4000c7e5be6..dc6c880cb6057 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
@@ -149,7 +149,7 @@ RecordARMScatteredHalfRelocation(MachObjectWriter *Writer,
if (FixupOffset & 0xff000000) {
Asm.getContext().reportError(Fixup.getLoc(),
"can not encode offset '0x" +
- to_hexString(FixupOffset) +
+ utohexstr(FixupOffset) +
"' in resulting scattered relocation.");
return;
}
@@ -264,7 +264,7 @@ void ARMMachObjectWriter::RecordARMScatteredRelocation(MachObjectWriter *Writer,
if (FixupOffset & 0xff000000) {
Asm.getContext().reportError(Fixup.getLoc(),
"can not encode offset '0x" +
- to_hexString(FixupOffset) +
+ utohexstr(FixupOffset) +
"' in resulting scattered relocation.");
return;
}
diff --git a/llvm/tools/llvm-profgen/PerfReader.cpp b/llvm/tools/llvm-profgen/PerfReader.cpp
index 98963cc28b4a6..f28a852fad64a 100644
--- a/llvm/tools/llvm-profgen/PerfReader.cpp
+++ b/llvm/tools/llvm-profgen/PerfReader.cpp
@@ -467,9 +467,9 @@ static std::string getContextKeyStr(ContextKey *K,
if (OContextStr.str().size())
OContextStr << " @ ";
OContextStr << "0x"
- << to_hexString(
+ << utohexstr(
Binary->virtualAddrToOffset(CtxKey->Context[I]),
- false);
+ /*LowerCase=*/true);
}
return OContextStr.str();
} else {
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 3cd77065be378..d0925a322e268 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -3309,7 +3309,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printFileHeaders() {
OS.PadToColumn(2u);
OS << "Version:";
OS.PadToColumn(37u);
- OS << to_hexString(e.e_ident[ELF::EI_VERSION]);
+ OS << utohexstr(e.e_ident[ELF::EI_VERSION]);
if (e.e_version == ELF::EV_CURRENT)
OS << " (current)";
OS << "\n";
@@ -3322,19 +3322,19 @@ template <class ELFT> void GNUELFDumper<ELFT>::printFileHeaders() {
Str = E->AltName.str();
} else {
if (e.e_type >= ET_LOPROC)
- Str = "Processor Specific: (" + to_hexString(e.e_type, false) + ")";
+ Str = "Processor Specific: (" + utohexstr(e.e_type, /*LowerCase=*/true) + ")";
else if (e.e_type >= ET_LOOS)
- Str = "OS Specific: (" + to_hexString(e.e_type, false) + ")";
+ Str = "OS Specific: (" + utohexstr(e.e_type, /*LowerCase=*/true) + ")";
else
- Str = "<unknown>: " + to_hexString(e.e_type, false);
+ Str = "<unknown>: " + utohexstr(e.e_type, /*LowerCase=*/true);
}
printFields(OS, "Type:", Str);
Str = enumToString(e.e_machine, makeArrayRef(ElfMachineType));
printFields(OS, "Machine:", Str);
- Str = "0x" + to_hexString(e.e_version);
+ Str = "0x" + utohexstr(e.e_version);
printFields(OS, "Version:", Str);
- Str = "0x" + to_hexString(e.e_entry);
+ Str = "0x" + utohexstr(e.e_entry);
printFields(OS, "Entry point address:", Str);
Str = to_string(e.e_phoff) + " (bytes into file)";
printFields(OS, "Start of program headers:", Str);
@@ -3351,7 +3351,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printFileHeaders() {
else if (e.e_machine == EM_AVR)
ElfFlags = printFlags(e.e_flags, makeArrayRef(ElfHeaderAVRFlags),
unsigned(ELF::EF_AVR_ARCH_MASK));
- Str = "0x" + to_hexString(e.e_flags);
+ Str = "0x" + utohexstr(e.e_flags);
if (!ElfFlags.empty())
Str = Str + ", " + ElfFlags;
printFields(OS, "Flags:", Str);
@@ -3529,7 +3529,7 @@ void GNUELFDumper<ELFT>::printRelRelaReloc(const Relocation<ELFT> &R,
Addend = " + ";
}
}
- Addend += to_hexString(RelAddend, false);
+ Addend += utohexstr(RelAddend, /*LowerCase=*/true);
}
OS << Addend << "\n";
}
@@ -3561,7 +3561,7 @@ void GNUELFDumper<ELFT>::printDynamicRelocHeader(unsigned Type, StringRef Name,
const DynRegionInfo &Reg) {
uint64_t Offset = Reg.Addr - this->Obj.base();
OS << "\n'" << Name.str().c_str() << "' relocation section at offset 0x"
- << to_hexString(Offset, false) << " contains " << Reg.Size << " bytes:\n";
+ << utohexstr(Offset, /*LowerCase=*/true) << " contains " << Reg.Size << " bytes:\n";
printRelocHeaderFields<ELFT>(OS, Type);
}
@@ -3614,7 +3614,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printRelocations() {
uintX_t Offset = Sec.sh_offset;
StringRef Name = this->getPrintableSectionName(Sec);
OS << "\nRelocation section '" << Name << "' at offset 0x"
- << to_hexString(Offset, false) << " contains " << EntriesNum
+ << utohexstr(Offset, /*LowerCase=*/true) << " contains " << EntriesNum
<< " entries:\n";
printRelocHeaderFields<ELFT>(OS, Sec.sh_type);
this->printRelocationsHelper(Sec);
@@ -3629,12 +3629,12 @@ template <class ELFT> void GNUELFDumper<ELFT>::printRelocations() {
// returned as '<unknown>' followed by the type value.
static std::string getSectionTypeOffsetString(unsigned Type) {
if (Type >= SHT_LOOS && Type <= SHT_HIOS)
- return "LOOS+0x" + to_hexString(Type - SHT_LOOS);
+ return "LOOS+0x" + utohexstr(Type - SHT_LOOS);
else if (Type >= SHT_LOPROC && Type <= SHT_HIPROC)
- return "LOPROC+0x" + to_hexString(Type - SHT_LOPROC);
+ return "LOPROC+0x" + utohexstr(Type - SHT_LOPROC);
else if (Type >= SHT_LOUSER && Type <= SHT_HIUSER)
- return "LOUSER+0x" + to_hexString(Type - SHT_LOUSER);
- return "0x" + to_hexString(Type) + ": <unknown>";
+ return "LOUSER+0x" + utohexstr(Type - SHT_LOUSER);
+ return "0x" + utohexstr(Type) + ": <unknown>";
}
static std::string getSectionTypeString(unsigned Machine, unsigned Type) {
@@ -3679,7 +3679,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printSectionHeaders() {
ArrayRef<Elf_Shdr> Sections = cantFail(this->Obj.sections());
OS << "There are " << to_string(Sections.size())
<< " section headers, starting at offset "
- << "0x" << to_hexString(this->Obj.getHeader().e_shoff, false) << ":\n\n";
+ << "0x" << utohexstr(this->Obj.getHeader().e_shoff, /*LowerCase=*/true) << ":\n\n";
OS << "Section Headers:\n";
Field Fields[11] = {
{"[Nr]", 2}, {"Name", 7}, {"Type", 25},
@@ -3837,7 +3837,7 @@ void GNUELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
Other &= ~STO_AARCH64_VARIANT_PCS;
Fields[5].Str += " [VARIANT_PCS";
if (Other != 0)
- Fields[5].Str.append(" | " + to_hexString(Other, false));
+ Fields[5].Str.append(" | " + utohexstr(Other, /*LowerCase=*/true));
Fields[5].Str.append("]");
}
} else if (this->Obj.getHeader().e_machine == ELF::EM_RISCV) {
@@ -3846,7 +3846,7 @@ void GNUELFDumper<ELFT>::printSymbol(const Elf_Sym &Symbol, unsigned SymIndex,
Other &= ~STO_RISCV_VARIANT_CC;
Fields[5].Str += " [VARIANT_CC";
if (Other != 0)
- Fields[5].Str.append(" | " + to_hexString(Other, false));
+ Fields[5].Str.append(" | " + utohexstr(Other, /*LowerCase=*/true));
Fields[5].Str.append("]");
}
} else {
@@ -4058,7 +4058,7 @@ template <class ELFT> void GNUELFDumper<ELFT>::printSectionDetails() {
ArrayRef<Elf_Shdr> Sections = cantFail(this->Obj.sections());
OS << "There are " << to_string(Sections.size())
<< " section headers, starting at offset "
- << "0x" << to_hexString(this->Obj.getHeader().e_shoff, false) << ":\n\n";
+ << "0x" << utohexstr(this->Obj.getHeader().e_shoff, /*LowerCase=*/true) << ":\n\n";
OS << "Section Headers:\n";
@@ -6464,7 +6464,7 @@ template <class ELFT> void LLVMELFDumper<ELFT>::printFileHeaders() {
else
TypeStr = "Unknown";
}
- W.printString("Type", TypeStr + " (0x" + to_hexString(E.e_type) + ")");
+ W.printString("Type", TypeStr + " (0x" + utohexstr(E.e_type) + ")");
W.printEnum("Machine", E.e_machine, makeArrayRef(ElfMachineType));
W.printNumber("Version", E.e_version);
More information about the llvm-commits
mailing list