[llvm-branch-commits] [llvm-branch] r359851 - Merging r355607:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu May  2 17:12:22 2019
New Revision: 359851

URL: http://llvm.org/viewvc/llvm-project?rev=359851&view=rev
Log:
Merging r355607:

------------------------------------------------------------------------
r355607 | petarj | 2019-03-07 08:31:08 -0800 (Thu, 07 Mar 2019) | 11 lines

[DebugInfo] Fix the type of the formated variable

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.

Patch by Milos Stojanovic.

Differential Revision: https://reviews.llvm.org/D58451

------------------------------------------------------------------------

Modified:
    llvm/branches/release_80/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
    llvm/branches/release_80/test/tools/llvm-objdump/eh_frame-coff.test

Modified: llvm/branches/release_80/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp?rev=359851&r1=359850&r2=359851&view=diff
==============================================================================
--- llvm/branches/release_80/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp (original)
+++ llvm/branches/release_80/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp Thu May  2 17:12:22 2019
@@ -301,7 +301,7 @@ void CIE::dump(raw_ostream &OS, const MC
   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)
@@ -320,7 +320,7 @@ void FDE::dump(raw_ostream &OS, const MC
                (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";
 }

Modified: llvm/branches/release_80/test/tools/llvm-objdump/eh_frame-coff.test
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/test/tools/llvm-objdump/eh_frame-coff.test?rev=359851&r1=359850&r2=359851&view=diff
==============================================================================
--- llvm/branches/release_80/test/tools/llvm-objdump/eh_frame-coff.test (original)
+++ llvm/branches/release_80/test/tools/llvm-objdump/eh_frame-coff.test Thu May  2 17:12:22 2019
@@ -8,7 +8,7 @@
 # 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
@@ -17,7 +17,7 @@
 # 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