Skip to content

Commit

Permalink
[DebugInfo] Fix the type of the formated variable
Browse files Browse the repository at this point in the history
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

llvm-svn: 355607
  • Loading branch information
petar-jovanovic committed Mar 7, 2019
1 parent 9404955 commit 95817d3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
Expand Up @@ -300,7 +300,7 @@ void CIE::dump(raw_ostream &OS, const MCRegisterInfo *MRI, bool IsEH) const {
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)
Expand All @@ -319,7 +319,7 @@ void FDE::dump(raw_ostream &OS, const MCRegisterInfo *MRI, bool IsEH) const {
(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";
}
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/tools/llvm-objdump/eh_frame-coff.test
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 95817d3

Please sign in to comment.