[llvm] r314291 - [dwarfdump] Fix printing of .debug_line offset.

[Jonas Devlieghere via llvm-commits]

Author: jdevlieghere
Date: Wed Sep 27 03:00:27 2017
New Revision: 314291

URL: http://llvm.org/viewvc/llvm-project?rev=314291&view=rev
Log:
[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

Modified:
    llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
    llvm/trunk/test/DebugInfo/Generic/lto-comp-dir.ll
    llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll
    llvm/trunk/test/tools/llvm-dwarfdump/X86/debug_line_offset.test

Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp?rev=314291&r1=314290&r2=314291&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp Wed Sep 27 03:00:27 2017
@@ -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 {

Modified: llvm/trunk/test/DebugInfo/Generic/lto-comp-dir.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Generic/lto-comp-dir.ll?rev=314291&r1=314290&r2=314291&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/Generic/lto-comp-dir.ll (original)
+++ llvm/trunk/test/DebugInfo/Generic/lto-comp-dir.ll Wed Sep 27 03:00:27 2017
@@ -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

Modified: llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll?rev=314291&r1=314290&r2=314291&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll Wed Sep 27 03:00:27 2017
@@ -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

Modified: llvm/trunk/test/tools/llvm-dwarfdump/X86/debug_line_offset.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/X86/debug_line_offset.test?rev=314291&r1=314290&r2=314291&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/X86/debug_line_offset.test (original)
+++ llvm/trunk/test/tools/llvm-dwarfdump/X86/debug_line_offset.test Wed Sep 27 03:00:27 2017
@@ -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