[llvm][DebugInfo] Use formatv in GsymReaderV1 and GsymReaderV2

[kwk]

This relates to #35980.

Here are all independent PRs that deal with replacing format with formatv in llvm/lib/DebugInfo:

• [llvm][DebugInfo] Use formatv in LVDWARFReader #192011
• [llvm][DebugInfo] formatv in LVCodeViewVisitor #192010
• [llvm][DebugInfo] formatv in LVBinaryReader #192009
• [llvm][DebugInfo] formatv in LVScope #192008
• [llvm][DebugInfo] Use formatv in LVReader #192007
• [llvm][DebugInfo] formatv in LVRange #192006
• [llvm][DebugInfo] formatv in LVObject #192004
• [llvm][DebugInfo] formatv in LVLocation #192003
• [llvm][DebugInfo] formatv in LVElement #192002
• [llvm][DebugInfo] Use formatv in LVCompare #192001
• -> [llvm][DebugInfo] Use formatv in GsymReaderV1 and GsymReaderV2 #192000
• [llvm][DebugInfo] formatv in DWARFUnwindTablePrinter #191999
• [llvm][DebugInfo] Use formatv in DWARFUnitIndex #191998
• [llvm][DebugInfo] formatv in DWARFTypeUnit #191997
• [llvm][DebugInfo] formatv in DWARFListTable #191996
• [llvm][DebugInfo] Use formatv in DWARFGdbIndex #191994
• [llvm][DebugInfo] Use formatv in DWARFExpressionPrinter #191993
• [llvm][DebugInfo] formatv in DWARFDie #191992
• [llvm][DebugInfo] formatv in DWARFDebugRnglists #191991
• [llvm][DebugInfo] formatv in DWARFDebugRangeList #191989
• [llvm][DebugInfo] Use formatv in DWARFDebugPubTable #191988
• [llvm][DebugInfo] formatv in DWARFDebugMacro #191987
• [llvm][DebugInfo] formatv in DWARFDebugLine #191986
• [llvm][DebugInfo] formatv in DWARFDebugFrame #191984
• [llvm][DebugInfo] formatv in DWARFContext #191983
• [llvm][DebugInfo] Use formatv in DWARFCFIPrinter #191982
• [llvm][DebugInfo] Use formatv in DWARFAcceleratorTable #191981
• [llvm][DebugInfo] Add more format/formatv equivalence tests #191980

[llvmbot]

@llvm/pr-subscribers-debuginfo

Author: Konrad Kleine (kwk)

Changes

This relates to #35980.

---

Full diff: https://github.com/llvm/llvm-project/pull/192000.diff

1 Files Affected:

• (modified) llvm/lib/DebugInfo/GSYM/GsymReader.cpp (+4-3)

diff --git a/llvm/lib/DebugInfo/GSYM/GsymReader.cpp b/llvm/lib/DebugInfo/GSYM/GsymReader.cpp
index 0a5bb7caaee8c..1a20bd6310e7f 100644
--- a/llvm/lib/DebugInfo/GSYM/GsymReader.cpp
+++ b/llvm/lib/DebugInfo/GSYM/GsymReader.cpp
@@ -17,6 +17,7 @@
 #include "llvm/DebugInfo/GSYM/LineTable.h"
 #include "llvm/Support/BinaryStreamReader.h"
 #include "llvm/Support/DataExtractor.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/MemoryBuffer.h"
 
 using namespace llvm;
@@ -398,7 +399,7 @@ void GsymReader::dump(raw_ostream &OS) {
   OS << " (ADDRESS)\n";
   OS << "====== =============================== \n";
   for (uint32_t I = 0; I < Header.NumAddresses; ++I) {
-    OS << format("[%4u] ", I);
+    OS << formatv("[{0,4}] ", I);
     switch (Hdr->AddrOffSize) {
     case 1: OS << HEX8(getAddrOffsets<uint8_t>()[I]); break;
     case 2: OS << HEX16(getAddrOffsets<uint16_t>()[I]); break;
@@ -413,13 +414,13 @@ void GsymReader::dump(raw_ostream &OS) {
   OS << "INDEX  Offset\n";
   OS << "====== ==========\n";
   for (uint32_t I = 0; I < Header.NumAddresses; ++I)
-    OS << format("[%4u] ", I) << HEX32(AddrInfoOffsets[I]) << "\n";
+    OS << formatv("[{0,4}] ", I) << HEX32(AddrInfoOffsets[I]) << "\n";
   // Dump the file table.
   OS << "\nFiles:\n";
   OS << "INDEX  DIRECTORY  BASENAME   PATH\n";
   OS << "====== ========== ========== ==============================\n";
   for (uint32_t I = 0; I < Files.size(); ++I) {
-    OS << format("[%4u] ", I) << HEX32(Files[I].Dir) << ' '
+    OS << formatv("[{0,4}] ", I) << HEX32(Files[I].Dir) << ' '
        << HEX32(Files[I].Base) << ' ';
     dump(OS, getFile(I));
     OS << "\n";

[kwk]

@s-barannikov do you approve this PR? If it is enough that David approved, I'm fine to merge it. After resolving the conflict of course.

[s-barannikov]

LGTM, assuming conflict resolution doesn't change it significantly.

[kwk]

LGTM, assuming conflict resolution doesn't change it significantly.

It is not significantly different but the code was reorganized and split into V1 and V2 in c365068. I'm running local tests to see if the newly pushed code works.

UPDATE: ninja check-llvm worked fine locally.