[llvm] r344896 - [llvm-dwarfdump] - Fix win10 build bot failture.

[George Rimar via llvm-commits]

Author: grimar
Date: Mon Oct 22 05:18:30 2018
New Revision: 344896

URL: http://llvm.org/viewvc/llvm-project?rev=344896&view=rev
Log:
[llvm-dwarfdump] - Fix win10 build bot failture.

Bot failed: 
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/20877/steps/test/logs/stdio

This was broken after the 
r344895 "[llvm-dwarfdump] - Add the support of parsing .debug_loclists."
because of wrong formatting specifiers used.

Modified:
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp
    llvm/trunk/test/DebugInfo/X86/dwarfdump-debug-loclists.test

Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp?rev=344896&r1=344895&r2=344896&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp Mon Oct 22 05:18:30 2018
@@ -227,13 +227,16 @@ void DWARFDebugLoclists::LocationList::d
     case dwarf::DW_LLE_start_length:
       OS << '\n';
       OS.indent(Indent);
-      OS << format("[0x%8.8x, 0x%8.8x): ", E.Value0, E.Value0 + E.Value1);
+      OS << format("[0x%*.*" PRIx64 ", 0x%*.*x): ", AddressSize * 2,
+                   AddressSize * 2, E.Value0, AddressSize * 2, AddressSize * 2,
+                   E.Value0 + E.Value1);
       break;
     case dwarf::DW_LLE_offset_pair:
       OS << '\n';
       OS.indent(Indent);
-      OS << format("[0x%8.8x, 0x%8.8x): ", BaseAddr + E.Value0,
-                   BaseAddr + E.Value1);
+      OS << format("[0x%*.*" PRIx64 ", 0x%*.*x): ", AddressSize * 2,
+                   AddressSize * 2, BaseAddr + E.Value0, AddressSize * 2,
+                   AddressSize * 2, BaseAddr + E.Value1);
       break;
     case dwarf::DW_LLE_base_address:
       BaseAddr = E.Value0;

Modified: llvm/trunk/test/DebugInfo/X86/dwarfdump-debug-loclists.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/dwarfdump-debug-loclists.test?rev=344896&r1=344895&r2=344896&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/dwarfdump-debug-loclists.test (original)
+++ llvm/trunk/test/DebugInfo/X86/dwarfdump-debug-loclists.test Mon Oct 22 05:18:30 2018
@@ -4,16 +4,16 @@
 # CHECK:      .debug_info
 # CHECK:       DW_AT_name{{.*}}"stub"
 # CHECK:       DW_AT_location [DW_FORM_sec_offset]   (0x0000000c
-# CHECK-NEXT:    [0x00000010, 0x00000020): DW_OP_breg5 RDI+0
-# CHECK-NEXT:    [0x00000530, 0x00000540): DW_OP_breg6 RBP-8, DW_OP_deref
-# CHECK-NEXT:    [0x00000700, 0x00000710): DW_OP_breg5 RDI+0
+# CHECK-NEXT:    [0x0000000000000010, 0x0000000000000020): DW_OP_breg5 RDI+0
+# CHECK-NEXT:    [0x0000000000000530, 0x0000000000000540): DW_OP_breg6 RBP-8, DW_OP_deref
+# CHECK-NEXT:    [0x0000000000000700, 0x0000000000000710): DW_OP_breg5 RDI+0
 
 # CHECK:      .debug_loclists contents:
 # CHECK-NEXT: 0x00000000: locations list header: length = 0x00000031, version = 0x0005, addr_size = 0x08, seg_size = 0x00, offset_entry_count = 0x00000000
 # CHECK-NEXT: 0x00000000:
-# CHECK-NEXT:   [0x00000000, 0x00000010): DW_OP_breg5 RDI+0
-# CHECK-NEXT:   [0x00000530, 0x00000540): DW_OP_breg6 RBP-8, DW_OP_deref
-# CHECK-NEXT:   [0x00000700, 0x00000710): DW_OP_breg5 RDI+0
+# CHECK-NEXT:   [0x0000000000000000, 0x0000000000000010): DW_OP_breg5 RDI+0
+# CHECK-NEXT:   [0x0000000000000530, 0x0000000000000540): DW_OP_breg6 RBP-8, DW_OP_deref
+# CHECK-NEXT:   [0x0000000000000700, 0x0000000000000710): DW_OP_breg5 RDI+0
 
 .section  .debug_str,"MS", at progbits,1
   .asciz  "stub"