[llvm][DebugInfo] formatv in DWARFDebugLine#191986
Merged
Conversation
This relates to llvm#35980.
Member
|
@llvm/pr-subscribers-debuginfo Author: Konrad Kleine (kwk) ChangesThis relates to #35980. Full diff: https://github.com/llvm/llvm-project/pull/191986.diff 1 Files Affected:
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
index 4cc234b801be6..e509421dd1f01 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
@@ -17,6 +17,7 @@
#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
#include "llvm/Support/Errc.h"
#include "llvm/Support/Format.h"
+#include "llvm/Support/FormatAdapters.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
@@ -121,23 +122,25 @@ void DWARFDebugLine::Prologue::dump(raw_ostream &OS,
return;
int OffsetDumpWidth = 2 * dwarf::getDwarfOffsetByteSize(FormParams.Format);
OS << "Line table prologue:\n"
- << format(" total_length: 0x%0*" PRIx64 "\n", OffsetDumpWidth,
- TotalLength)
+ << formatv(" total_length: 0x{0:x-}\n",
+ fmt_align(TotalLength, AlignStyle::Right, OffsetDumpWidth, '0'))
<< " format: " << dwarf::FormatString(FormParams.Format) << "\n"
- << format(" version: %u\n", getVersion());
+ << formatv(" version: {0}\n", getVersion());
if (!versionIsSupported(getVersion()))
return;
if (getVersion() >= 5)
- OS << format(" address_size: %u\n", getAddressSize())
- << format(" seg_select_size: %u\n", SegSelectorSize);
- OS << format(" prologue_length: 0x%0*" PRIx64 "\n", OffsetDumpWidth,
- PrologueLength)
- << format(" min_inst_length: %u\n", MinInstLength)
- << format(getVersion() >= 4 ? "max_ops_per_inst: %u\n" : "", MaxOpsPerInst)
- << format(" default_is_stmt: %u\n", DefaultIsStmt)
- << format(" line_base: %i\n", LineBase)
- << format(" line_range: %u\n", LineRange)
- << format(" opcode_base: %u\n", OpcodeBase);
+ OS << formatv(" address_size: {0}\n", getAddressSize())
+ << formatv(" seg_select_size: {0}\n", SegSelectorSize);
+ OS << formatv(
+ " prologue_length: 0x{0:x-}\n",
+ fmt_align(PrologueLength, AlignStyle::Right, OffsetDumpWidth, '0'))
+ << formatv(" min_inst_length: {0}\n", MinInstLength);
+ if (getVersion() >= 4)
+ OS << formatv("max_ops_per_inst: {0}\n", MaxOpsPerInst);
+ OS << formatv(" default_is_stmt: {0}\n", DefaultIsStmt)
+ << formatv(" line_base: {0}\n", static_cast<int>(LineBase))
+ << formatv(" line_range: {0}\n", LineRange)
+ << formatv(" opcode_base: {0}\n", OpcodeBase);
for (uint32_t I = 0; I != StandardOpcodeLengths.size(); ++I)
OS << formatv("standard_opcode_lengths[{0}] = {1}\n",
@@ -148,7 +151,7 @@ void DWARFDebugLine::Prologue::dump(raw_ostream &OS,
// DWARF v5 starts directory indexes at 0.
uint32_t DirBase = getVersion() >= 5 ? 0 : 1;
for (uint32_t I = 0; I != IncludeDirectories.size(); ++I) {
- OS << format("include_directories[%3u] = ", I + DirBase);
+ OS << formatv("include_directories[{0,3}] = ", I + DirBase);
IncludeDirectories[I].dump(OS, DumpOptions);
OS << '\n';
}
@@ -159,16 +162,16 @@ void DWARFDebugLine::Prologue::dump(raw_ostream &OS,
uint32_t FileBase = getVersion() >= 5 ? 0 : 1;
for (uint32_t I = 0; I != FileNames.size(); ++I) {
const FileNameEntry &FileEntry = FileNames[I];
- OS << format("file_names[%3u]:\n", I + FileBase);
+ OS << formatv("file_names[{0,3}]:\n", I + FileBase);
OS << " name: ";
FileEntry.Name.dump(OS, DumpOptions);
- OS << '\n' << format(" dir_index: %" PRIu64 "\n", FileEntry.DirIdx);
+ OS << '\n' << formatv(" dir_index: {0}\n", FileEntry.DirIdx);
if (ContentTypes.HasMD5)
OS << " md5_checksum: " << FileEntry.Checksum.digest() << '\n';
if (ContentTypes.HasModTime)
- OS << format(" mod_time: 0x%8.8" PRIx64 "\n", FileEntry.ModTime);
+ OS << formatv(" mod_time: {0:x8}\n", FileEntry.ModTime);
if (ContentTypes.HasLength)
- OS << format(" length: 0x%8.8" PRIx64 "\n", FileEntry.Length);
+ OS << formatv(" length: {0:x8}\n", FileEntry.Length);
if (ContentTypes.HasSource) {
auto Source = FileEntry.Source.getAsCString();
if (!Source)
@@ -515,8 +518,8 @@ void DWARFDebugLine::Row::dumpTableHeader(raw_ostream &OS, unsigned Indent) {
}
void DWARFDebugLine::Row::dump(raw_ostream &OS) const {
- OS << format("0x%16.16" PRIx64 " %6u %6u", Address.Address, Line, Column)
- << format(" %6u %3u %13u %7u ", File, Isa, Discriminator, OpIndex)
+ OS << formatv("{0:x16} {1,6} {2,6}", Address.Address, Line, Column)
+ << formatv(" {0,6} {1,3} {2,13} {3,7} ", File, Isa, Discriminator, OpIndex)
<< (IsStmt ? " is_stmt" : "") << (BasicBlock ? " basic_block" : "")
<< (PrologueEnd ? " prologue_end" : "")
<< (EpilogueBegin ? " epilogue_begin" : "")
@@ -869,14 +872,14 @@ Error DWARFDebugLine::LineTable::parse(
DataExtractor::Cursor Cursor(*OffsetPtr);
if (Verbose)
- *OS << format("0x%08.08" PRIx64 ": ", *OffsetPtr);
+ *OS << formatv("{0:x8}: ", *OffsetPtr);
uint64_t OpcodeOffset = *OffsetPtr;
uint8_t Opcode = TableData.getU8(Cursor);
size_t RowCount = Rows.size();
if (Cursor && Verbose)
- *OS << format("%02.02" PRIx8 " ", Opcode);
+ *OS << formatv("{0:x-2} ", Opcode);
if (Opcode == 0) {
// Extended Opcodes always start with a zero opcode followed by
@@ -1011,8 +1014,8 @@ Error DWARFDebugLine::LineTable::parse(
FileEntry.Length = TableData.getULEB128(Cursor);
Prologue.FileNames.push_back(FileEntry);
if (Cursor && Verbose)
- *OS << " (" << Name << ", dir=" << FileEntry.DirIdx << ", mod_time="
- << format("(0x%16.16" PRIx64 ")", FileEntry.ModTime)
+ *OS << " (" << Name << ", dir=" << FileEntry.DirIdx
+ << ", mod_time=" << formatv("({0:x16})", FileEntry.ModTime)
<< ", length=" << FileEntry.Length << ")";
}
break;
@@ -1025,8 +1028,8 @@ Error DWARFDebugLine::LineTable::parse(
default:
if (Cursor && Verbose)
- *OS << format("Unrecognized extended op 0x%02.02" PRIx8, SubOpcode)
- << format(" length %" PRIx64, Len);
+ *OS << formatv("Unrecognized extended op {0:x2}", SubOpcode)
+ << formatv(" length {0:x-}", Len);
// Len doesn't include the zero opcode byte or the length itself, but
// it does include the sub_opcode, so we have to adjust for that.
TableData.skip(Cursor, Len - 1);
@@ -1049,7 +1052,7 @@ Error DWARFDebugLine::LineTable::parse(
if (ByteCursor) {
*OS << " (<parsing error>";
do {
- *OS << format(" %2.2" PRIx8, Byte);
+ *OS << formatv(" {0:x-2}", Byte);
Byte = TableData.getU8(ByteCursor);
} while (ByteCursor);
*OS << ")";
@@ -1149,9 +1152,8 @@ Error DWARFDebugLine::LineTable::parse(
ParsingState::OpcodeAdvanceResults Advance =
State.advanceForOpcode(Opcode, OpcodeOffset);
if (Verbose)
- *OS << format(" (addr += 0x%16.16" PRIx64 ", op-index += %" PRIu8
- ")",
- Advance.AddrDelta, Advance.OpIndexDelta);
+ *OS << formatv(" (addr += {0:x16}, op-index += {1})",
+ Advance.AddrDelta, Advance.OpIndexDelta);
}
break;
@@ -1172,8 +1174,7 @@ Error DWARFDebugLine::LineTable::parse(
State.Row.Address.Address += PCOffset;
State.Row.OpIndex = 0;
if (Verbose)
- *OS << format(" (addr += 0x%4.4" PRIx16 ", op-index = 0)",
- PCOffset);
+ *OS << formatv(" (addr += {0:x4}, op-index = 0)", PCOffset);
}
}
break;
@@ -1222,7 +1223,7 @@ Error DWARFDebugLine::LineTable::parse(
*OS << " (operands: ";
ListSeparator LS;
for (uint64_t Value : Operands)
- *OS << LS << format("0x%16.16" PRIx64, Value);
+ *OS << LS << formatv("{0:x16}", Value);
*OS << ')';
}
}
|
This was referenced Apr 14, 2026
This was referenced Apr 14, 2026
DavidSpickett
approved these changes
Apr 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This relates to #35980.
Here are all independent PRs that deal with replacing
formatwithformatvinllvm/lib/DebugInfo: