[PATCH] D137400: [llvm-debuginfo-analyzer] Fix format string-type mismatch in LVScope

[Michał Górny via Phabricator via llvm-commits]

mgorny updated this revision to Diff 473154.
mgorny added a comment.

Also reenable the test on ARM.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D137400/new/

https://reviews.llvm.org/D137400

Files:
  llvm/lib/DebugInfo/LogicalView/Core/LVScope.cpp
  llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test


Index: llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test
===================================================================
--- llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test
+++ llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test
@@ -1,8 +1,5 @@
 ; REQUIRES: x86-registered-target
 
-; FIXME: Test failure https://reviews.llvm.org/D125783
-; UNSUPPORTED: arm
-
 ; Test case 6 - Full logical view
 
 ; test.cpp
Index: llvm/lib/DebugInfo/LogicalView/Core/LVScope.cpp
===================================================================
--- llvm/lib/DebugInfo/LogicalView/Core/LVScope.cpp
+++ llvm/lib/DebugInfo/LogicalView/Core/LVScope.cpp
@@ -1192,7 +1192,8 @@
                                  LVOffset Upper) {
   LLVM_DEBUG({
     dbgs() << format(
-        "CU [0x%08x], Scope [0x%08x], Range [0x%08x:0x%08x], Size = %d\n",
+        "CU [0x%08" PRIx64 "], Scope [0x%08" PRIx64 "], Range [0x%08" PRIx64
+        ":0x%08" PRIx64 "], Size = %" PRId64 "\n",
         getOffset(), Scope->getOffset(), Lower, Upper, Upper - Lower);
   });
 
@@ -1548,7 +1549,7 @@
     // implementation-defined rounding inside printing functions.
     float Percentage =
         rint((float(Size) / CUContributionSize) * 100.0 * 100.0) / 100.0;
-    OS << format("%10d (%6.2f%%) : ", Size, Percentage);
+    OS << format("%10" PRId64 " (%6.2f%%) : ", Size, Percentage);
     Scope->print(OS);
 
     // Keep record of the total sizes at each lexical level.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D137400.473154.patch
Type: text/x-patch
Size: 1524 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221104/bec8ef25/attachment.bin>