From edfbacb90b8d81ae08e45c9e85fd53f89b29afd3 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Wed, 27 Sep 2017 10:00:27 +0000 Subject: [PATCH] [dwarfdump] Fix printing of .debug_line offset. Fixes 32-bit buildbots: http://bb.pgr.jp/builders/test-llvm-i686-linux-RA/builds/542 http://lab.llvm.org:8011/builders/clang-cmake-thumbv7-a15/builds/11533 http://lab.llvm.org:8011/builders/clang-cmake-armv7-a15/builds/11494 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@314291 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/DebugInfo/DWARF/DWARFContext.cpp | 2 +- test/DebugInfo/Generic/lto-comp-dir.ll | 4 ++-- test/DebugInfo/X86/stmt-list-multiple-compile-units.ll | 8 ++++---- test/tools/llvm-dwarfdump/X86/debug_line_offset.test | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/DebugInfo/DWARF/DWARFContext.cpp b/lib/DebugInfo/DWARF/DWARFContext.cpp index f6c8499c94e..d82a03e4fed 100644 --- a/lib/DebugInfo/DWARF/DWARFContext.cpp +++ b/lib/DebugInfo/DWARF/DWARFContext.cpp @@ -339,7 +339,7 @@ void DWARFContext::dump( uint32_t Offset = *StmtOffset; // Verbose dumping is done during parsing and not on the intermediate // representation. - OS << "debug_line[" << format("%16.16" PRIx64, Offset) << "]\n"; + OS << "debug_line[" << format("0x%8.8x", Offset) << "]\n"; if (DumpOpts.Verbose) { LineTable.parse(lineData, &Offset, &OS); } else { diff --git a/test/DebugInfo/Generic/lto-comp-dir.ll b/test/DebugInfo/Generic/lto-comp-dir.ll index 10766495e85..25c2f90d8cd 100644 --- a/test/DebugInfo/Generic/lto-comp-dir.ll +++ b/test/DebugInfo/Generic/lto-comp-dir.ll @@ -8,13 +8,13 @@ ; to refer to it. ; CHECK: .debug_line contents: -; CHECK-NEXT: debug_line[0000000000000000] +; CHECK-NEXT: debug_line[0x00000000] ; CHECK-NEXT: Line table prologue: ; CHECK-NOT: include_directories ; CHECK: file_names[ 1] 0 {{.*}} a.cpp ; CHECK-NOT: file_names -; CHECK: debug_line[0000000000000039] +; CHECK: debug_line[0x00000039] ; CHECK-NEXT: Line table prologue: ; CHECK-NOT: include_directories ; CHECK: file_names[ 1] 0 {{.*}} b.cpp diff --git a/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll b/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll index a7a9bda000f..30bfa4f7e9e 100644 --- a/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll +++ b/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll @@ -24,11 +24,11 @@ ; CHECK: .debug_line contents: -; CHECK-NEXT: debug_line[0000000000000000] +; CHECK-NEXT: debug_line[0x00000000] ; CHECK-NEXT: Line table prologue: ; CHECK-NEXT: total_length: 0x00000038 ; CHECK: file_names[ 1] 0 0x00000000 0x00000000 simple.c -; CHECK: debug_line[000000000000003c] +; CHECK: debug_line[0x0000003c] ; CHECK-NEXT: Line table prologue: ; CHECK-NEXT: total_length: 0x00000039 ; CHECK: file_names[ 1] 0 0x00000000 0x00000000 simple2.c @@ -43,11 +43,11 @@ ; DWARF3: .debug_line contents: -; DWARF3-NEXT: debug_line[0000000000000000] +; DWARF3-NEXT: debug_line[0x00000000] ; DWARF3-NEXT: Line table prologue: ; DWARF3-NEXT: total_length: 0x00000038 ; DWARF3: file_names[ 1] 0 0x00000000 0x00000000 simple.c -; DWARF3: debug_line[000000000000003c] +; DWARF3: debug_line[0x0000003c] ; DWARF3-NEXT: Line table prologue: ; DWARF3-NEXT: total_length: 0x00000039 ; DWARF3: file_names[ 1] 0 0x00000000 0x00000000 simple2.c diff --git a/test/tools/llvm-dwarfdump/X86/debug_line_offset.test b/test/tools/llvm-dwarfdump/X86/debug_line_offset.test index 4b73134fdf1..26a9145b925 100644 --- a/test/tools/llvm-dwarfdump/X86/debug_line_offset.test +++ b/test/tools/llvm-dwarfdump/X86/debug_line_offset.test @@ -1,20 +1,20 @@ RUN: llvm-dwarfdump %S/../../dsymutil/Inputs/basic-lto-dw4.macho.x86_64.o \ RUN: -debug-line=0x0 | FileCheck %s --check-prefix=CHECK-A -CHECK-A: debug_line[0000000000000000] +CHECK-A: debug_line[0x00000000] CHECK-A: Address Line Column File ISA Discriminator Flags CHECK-A-NET: ------------------ ------ ------ ------ --- ------------- ------------- CHECK-A-NET: 0x0000000000000000 26 0 1 0 0 is_stmt CHECK-A-NET: 0x0000000000000004 27 10 1 0 0 is_stmt prologue_end CHECK-A-NET: 0x0000000000000009 27 3 1 0 0 CHECK-A-NET: 0x0000000000000074 27 3 1 0 0 end_sequence -CHECK-A-NOT: debug_line[000000000000009a] +CHECK-A-NOT: debug_line[0x0000009a] RUN: llvm-dwarfdump %S/../../dsymutil/Inputs/basic-lto-dw4.macho.x86_64.o \ RUN: -debug-line=0x9a | FileCheck %s --check-prefix=CHECK-B -CHECK-B-NOT: debug_line[0000000000000000] -CHECK-B: debug_line[000000000000009a] +CHECK-B-NOT: debug_line[0x00000000] +CHECK-B: debug_line[0x0000009a] CHECK-B: Address Line Column File ISA Discriminator Flags CHECK-B-NEXT: ------------------ ------ ------ ------ --- ------------- ------------- CHECK-B-NEXT: 0x0000000000000050 16 0 1 0 0 is_stmt -- 2.49.0