llvm-dwarfdump: Print addresses in debug_line to the parsed address size

Author: dwblaikie

llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp

@@ -897,8 +897,11 @@ Error DWARFDebugLine::LineTable::parse(
               TableData.setAddressSize(ExtractorAddressSize);
           }
 
-          if (Cursor && Verbose)
-            *OS << format(" (0x%16.16" PRIx64 ")", State.Row.Address.Address);
+          if (Cursor && Verbose) {
+            *OS << " (";
+            DWARFFormValue::dumpAddress(*OS, OpcodeAddressSize, State.Row.Address.Address);
+            *OS << ')';
+          }
         }
         break;
 

llvm/test/tools/llvm-dwarfdump/X86/tombstone.s

@@ -64,12 +64,11 @@
 # CHECK-DAG: .debug_line contents:
 # CHECK:      Address Line
 # CHECK-NEXT: --------------
-# FIXME: Dump the address with a size-appropriate encoding
-# CHECK-NEXT: DW_LNE_set_address (0x00000000ffffffff)
+# CHECK-NEXT: DW_LNE_set_address (0xffffffff)
 # CHECK-NEXT: DW_LNS_copy
 # CHECK-NEXT: DW_LNS_advance_pc (1)
 # CHECK-NEXT: DW_LNE_end_sequence
-# CHECK-NEXT: DW_LNE_set_address (0x0000000000000042)
+# CHECK-NEXT: DW_LNE_set_address (0x00000042)
 # CHECK-NEXT: DW_LNS_copy
 # CHECK-NEXT:   0x0000000000000042 1
 # CHECK-NEXT: DW_LNS_advance_pc (1)