[DebugInfo] Fix the type of the formated variable

[mstojanovic]

Summary

Change the format type of *Personality and *LSDAAddress to PRIx64 since they are of type uint64_t.
The problem was detected on mips builds, where it was printing junk values and causing test failure.

[probinson]

Please add a test.

lib/DebugInfo/DWARF/DWARFDebugFrame.cpp

303 ↗

(On Diff #187585)

Well, that looks like an improvement, but if the address is 64-bit, won't this print only the low-order half?

[mstojanovic]

lib/DebugInfo/DWARF/DWARFDebugFrame.cpp

303 ↗

(On Diff #187585)

This doesn't truncate so it would print the whole address but it's true that if the address can be 64-bit the output should be padded with the appropriate number of zeroes to indicate that.
I didn't change this because I assumed that the previous code was correct in guarantying a 32-bit output. Printing only 32 bits of a 64 bit variable isn't unique to this code and can be seen in other pars of LLVM as well, which leads me to believe that variables being 64-bit doesn't necessarily mean that there is a possibility they could hold a 64-bit value while being printed.
@rafauler Do you know if these addresses could be 64-bit here?

[mstojanovic]

Set the address output to 64-bit and fixed the test.

[probinson]

LGTM. It would be nice if we picked a width to print based on the width we read in, but this is fine.

llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp

if (Version >= 4) {
     OS << format("  Address size:          %u\n", (uint32_t)AddressSize);
     OS << format("  Segment desc size:     %u\n",
                  (uint32_t)SegmentDescriptorSize);
   }
   OS << format("  Code alignment factor: %u\n", (uint32_t)CodeAlignmentFactor);
   OS << format("  Data alignment factor: %d\n", (int32_t)DataAlignmentFactor);
   OS << format("  Return address column: %d\n", (int32_t)ReturnAddressRegister);
   if (Personality)
-    OS << format("  Personality Address: %08x\n", *Personality);
+    OS << format("  Personality Address: %016" PRIx64 "\n", *Personality);
   if (!AugmentationData.empty()) {
     OS << "  Augmentation data:    ";
     for (uint8_t Byte : AugmentationData)
       OS << ' ' << hexdigit(Byte >> 4) << hexdigit(Byte & 0xf);
     OS << "\n";
   }
   OS << "\n";
   CFIs.dump(OS, MRI, IsEH);
   OS << "\n";
 }
 
 void FDE::dump(raw_ostream &OS, const MCRegisterInfo *MRI, bool IsEH) const {
   OS << format("%08x %08x %08x FDE ", (uint32_t)Offset, (uint32_t)Length,
                (int32_t)LinkedCIEOffset);
   OS << format("cie=%08x pc=%08x...%08x\n", (int32_t)LinkedCIEOffset,
                (uint32_t)InitialLocation,
                (uint32_t)InitialLocation + (uint32_t)AddressRange);
   if (LSDAAddress)
-    OS << format("  LSDA Address: %08x\n", *LSDAAddress);
+    OS << format("  LSDA Address: %016" PRIx64 "\n", *LSDAAddress);
   CFIs.dump(OS, MRI, IsEH);
   OS << "\n";
 }
 
 DWARFDebugFrame::DWARFDebugFrame(Triple::ArchType Arch,
     bool IsEH, uint64_t EHFrameAddress)
     : Arch(Arch), IsEH(IsEH), EHFrameAddress(EHFrameAddress) {}
 

llvm/trunk/test/tools/llvm-objdump/eh_frame-coff.test

 # RUN: yaml2obj %p/Inputs/eh_frame-coff.yaml | llvm-objdump -dwarf=frames - 2>/dev/null | FileCheck %s
 
 # CHECK: .eh_frame contents:
 
 # CHECK: 00000000 0000001c ffffffff CIE
 # CHECK:   Version:               1
 # CHECK:   Augmentation:          "zPLR"
 # CHECK:   Code alignment factor: 1
 # CHECK:   Data alignment factor: -4
 # CHECK:   Return address column: 8
-# CHECK:   Personality Address: 004025d7
+# CHECK:   Personality Address: 00000000004025d7
 # CHECK:   Augmentation data:     00 D7 25 40 00 00 00
 
 # CHECK:   DW_CFA_def_cfa: reg4 +4
 # CHECK:   DW_CFA_offset: reg8 -4
 # CHECK:   DW_CFA_nop:
 # CHECK:   DW_CFA_nop:
 
 # CHECK: 00000020 0000001c 00000024 FDE cie=00000024 pc=00401410...00401488
-# CHECK:   LSDA Address: 00406000
+# CHECK:   LSDA Address: 0000000000406000
 # CHECK:   DW_CFA_advance_loc: 1
 # CHECK:   DW_CFA_def_cfa_offset: +8
 # CHECK:   DW_CFA_offset: reg5 -8
 # CHECK:   DW_CFA_advance_loc: 2
 # CHECK:   DW_CFA_def_cfa_register: reg5
 # CHECK:   DW_CFA_nop:
 # CHECK:   DW_CFA_nop:
 # CHECK:   DW_CFA_nop: