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

[mgorny]

Summary

Fix mismatch between %d/%x format strings and uint64_t type.
This fixes incorrect printing of "Scope Sizes" on 32-bit platforms
where this leads to llvm::print() misreading vararg.

[mgorny]

Also reenable the test on ARM.

[mgorny]

That said, I've only checked format strings in LVScope.cpp. I suspect other files may suffer from similar problems. If you replace llvm::format() with plain printf(), 32-bit GCC warns about type mismatches.

[mgorny]

Sorry, I meant GCC building for a 32-bit target, not 32-bit GCC ;-).

[CarlosAlbertoEnciso]

In D137400#3907490, @mgorny wrote:

That said, I've only checked format strings in LVScope.cpp. I suspect other files may suffer from similar problems. If you replace llvm::format() with plain printf(), 32-bit GCC warns about type mismatches.

PRIx64 it is a very good finding. I have the same feeling about the same issue in other modules. But at least we know the cause. Thanks for your fix.

[CarlosAlbertoEnciso]

LGTM.

[CarlosAlbertoEnciso]

@mgorny Can you update and close https://github.com/llvm/llvm-project/issues/58758 after your fix is landed. Thanks.

[mgorny]

In D137400#3907773, @CarlosAlbertoEnciso wrote:

@mgorny Can you update and close https://github.com/llvm/llvm-project/issues/58758 after your fix is landed. Thanks.

Will do. Thanks for the review!

llvm/lib/DebugInfo/LogicalView/Core/LVScope.cpp

 
 //===----------------------------------------------------------------------===//
 // An object file (single or multiple CUs).
 //===----------------------------------------------------------------------===//
 void LVScopeCompileUnit::addSize(LVScope *Scope, LVOffset Lower,
                                  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);
   });
 
   // There is no need to check for a previous entry, as we are traversing the
   // debug information in sequential order.
   LVOffset Size = Upper - Lower;
   Sizes[Scope] = Size;
   if (this == Scope)
void LVScopeCompileUnit::printScopeSize(const LVScope *Scope, raw_ostream &OS) {
   LVSizesMap::const_iterator Iter = Sizes.find(Scope);
   if (Iter != Sizes.end()) {
     LVOffset Size = Iter->second;
     assert(CUContributionSize && "Invalid CU contribution size.");
     // Get a percentage rounded to two decimal digits. This avoids
     // 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.
     LVLevel Level = Scope->getLevel();
     if (Level > MaxSeenLevel)
       MaxSeenLevel = Level;
     if (Level >= Totals.size())
       Totals.resize(2 * Level);

llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test

 ; REQUIRES: x86-registered-target
 
-; FIXME: Test failure https://reviews.llvm.org/D125783
-; UNSUPPORTED: arm
-
 ; Test case 6 - Full logical view
 
 ; test.cpp
 ;  1  using INTPTR = const int *;
 ;  2  int foo(INTPTR ParamPtr, unsigned ParamUnsigned, bool ParamBool) {
 ;  3    if (ParamBool) {
 ;  4      typedef int INTEGER;
 ;  5      const INTEGER CONSTANT = 7;