Index: llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp @@ -18,14 +18,14 @@ int OffsetDumpWidth = 2 * dwarf::getDwarfOffsetByteSize(getFormat()); OS << format("0x%08" PRIx64, getOffset()) << ": Compile Unit:" << " length = " << format("0x%0*" PRIx64, OffsetDumpWidth, getLength()) - << " version = " << format("0x%04x", getVersion()); + << ", version = " << format("0x%04x", getVersion()); if (getVersion() >= 5) - OS << " unit_type = " << dwarf::UnitTypeString(getUnitType()); - OS << " abbr_offset = " + OS << ", unit_type = " << dwarf::UnitTypeString(getUnitType()); + OS << ", abbr_offset = " << format("0x%04" PRIx64, getAbbreviations()->getOffset()) - << " addr_size = " << format("0x%02x", getAddressByteSize()); + << ", addr_size = " << format("0x%02x", getAddressByteSize()); if (getVersion() >= 5 && getUnitType() != dwarf::DW_UT_compile) - OS << " DWO_id = " << format("0x%016" PRIx64, *getDWOId()); + OS << ", DWO_id = " << format("0x%016" PRIx64, *getDWOId()); OS << " (next unit at " << format("0x%08" PRIx64, getNextUnitOffset()) << ")\n"; Index: llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp @@ -52,10 +52,10 @@ for (const Set &S : Sets) { int OffsetDumpWidth = 2 * dwarf::getDwarfOffsetByteSize(S.Format); OS << "length = " << format("0x%0*" PRIx64, OffsetDumpWidth, S.Length); - OS << " version = " << format("0x%04x", S.Version); - OS << " unit_offset = " + OS << ", version = " << format("0x%04x", S.Version); + OS << ", unit_offset = " << format("0x%0*" PRIx64, OffsetDumpWidth, S.Offset); - OS << " unit_size = " << format("0x%0*" PRIx64, OffsetDumpWidth, S.Size) + OS << ", unit_size = " << format("0x%0*" PRIx64, OffsetDumpWidth, S.Size) << '\n'; OS << (GnuStyle ? "Offset Linkage Kind Name\n" : "Offset Name\n"); Index: llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp @@ -24,23 +24,23 @@ if (DumpOpts.SummarizeTypes) { OS << "name = '" << Name << "'" - << " type_signature = " << format("0x%016" PRIx64, getTypeHash()) - << " length = " << format("0x%0*" PRIx64, OffsetDumpWidth, getLength()) + << ", type_signature = " << format("0x%016" PRIx64, getTypeHash()) + << ", length = " << format("0x%0*" PRIx64, OffsetDumpWidth, getLength()) << '\n'; return; } OS << format("0x%08" PRIx64, getOffset()) << ": Type Unit:" << " length = " << format("0x%0*" PRIx64, OffsetDumpWidth, getLength()) - << " version = " << format("0x%04x", getVersion()); + << ", version = " << format("0x%04x", getVersion()); if (getVersion() >= 5) - OS << " unit_type = " << dwarf::UnitTypeString(getUnitType()); - OS << " abbr_offset = " + OS << ", unit_type = " << dwarf::UnitTypeString(getUnitType()); + OS << ", abbr_offset = " << format("0x%04" PRIx64, getAbbreviations()->getOffset()) - << " addr_size = " << format("0x%02x", getAddressByteSize()) - << " name = '" << Name << "'" - << " type_signature = " << format("0x%016" PRIx64, getTypeHash()) - << " type_offset = " << format("0x%04" PRIx64, getTypeOffset()) + << ", addr_size = " << format("0x%02x", getAddressByteSize()) + << ", name = '" << Name << "'" + << ", type_signature = " << format("0x%016" PRIx64, getTypeHash()) + << ", type_offset = " << format("0x%04" PRIx64, getTypeOffset()) << " (next unit at " << format("0x%08" PRIx64, getNextUnitOffset()) << ")\n"; Index: llvm/test/DebugInfo/Generic/version.ll =================================================================== --- llvm/test/DebugInfo/Generic/version.ll +++ llvm/test/DebugInfo/Generic/version.ll @@ -2,7 +2,7 @@ ; RUN: llvm-dwarfdump %t | FileCheck %s ; Make sure we are generating DWARF version 3 when module flag says so. -; CHECK: Compile Unit: length = {{.*}} version = 0x0003 +; CHECK: Compile Unit: length = {{.*}}, version = 0x0003 define i32 @main() #0 !dbg !4 { entry: Index: llvm/test/DebugInfo/X86/dwarfdump-header-64.s =================================================================== --- llvm/test/DebugInfo/X86/dwarfdump-header-64.s +++ llvm/test/DebugInfo/X86/dwarfdump-header-64.s @@ -76,7 +76,7 @@ CU_5_end: # CHECK-LABEL: .debug_info contents: -# CHECK: 0x00000000: Compile Unit: length = 0x00000016 version = 0x0005 unit_type = DW_UT_compile abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x0000001a) +# CHECK: 0x00000000: Compile Unit: length = 0x00000016, version = 0x0005, unit_type = DW_UT_compile, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x0000001a) # CHECK: 0x0000000c: DW_TAG_compile_unit # CHECK-NEXT: DW_AT_producer {{.*}} "Handmade DWARF producer" # CHECK-NEXT: DW_AT_name {{.*}} "V5_compile_unit" Index: llvm/test/DebugInfo/X86/dwarfdump-header.s =================================================================== --- llvm/test/DebugInfo/X86/dwarfdump-header.s +++ llvm/test/DebugInfo/X86/dwarfdump-header.s @@ -107,7 +107,7 @@ .byte 0 # NULL CU_4_end: -# CHECK: 0x00000000: Compile Unit: length = 0x00000015 version = 0x0004 abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x00000019) +# CHECK: 0x00000000: Compile Unit: length = 0x00000015, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x00000019) # CHECK: 0x0000000b: DW_TAG_compile_unit # DWARF v5 normal CU header. @@ -125,7 +125,7 @@ .byte 0 # NULL CU_5_end: -# CHECK: 0x00000019: Compile Unit: length = 0x00000016 version = 0x0005 unit_type = DW_UT_compile abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x00000033) +# CHECK: 0x00000019: Compile Unit: length = 0x00000016, version = 0x0005, unit_type = DW_UT_compile, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x00000033) # CHECK: 0x00000025: DW_TAG_compile_unit .section .debug_info.dwo,"e",@progbits @@ -147,7 +147,7 @@ .byte 0 # NULL CU_split_5_end: -# CHECK: 0x00000000: Compile Unit: length = 0x0000001e version = 0x0005 unit_type = DW_UT_split_compile abbr_offset = 0x0000 addr_size = 0x08 DWO_id = 0x000000000000005a (next unit at 0x00000022) +# CHECK: 0x00000000: Compile Unit: length = 0x0000001e, version = 0x0005, unit_type = DW_UT_split_compile, abbr_offset = 0x0000, addr_size = 0x08, DWO_id = 0x000000000000005a (next unit at 0x00000022) # CHECK: 0x00000014: DW_TAG_compile_unit # CHECK-NEXT: DW_AT_producer {{.*}} "Handmade DWO producer" # CHECK-NEXT: DW_AT_name {{.*}} "V5_dwo_compile_unit" @@ -181,7 +181,7 @@ .byte 0 # NULL TU_split_5_end: -# CHECK: 0x00000000: Type Unit: length = 0x00000020 version = 0x0005 unit_type = DW_UT_split_type abbr_offset = 0x0000 addr_size = 0x08 name = 'V5_split_type_unit' type_signature = 0x8899aabbccddeeff type_offset = 0x001d (next unit at 0x00000024) +# CHECK: 0x00000000: Type Unit: length = 0x00000020, version = 0x0005, unit_type = DW_UT_split_type, abbr_offset = 0x0000, addr_size = 0x08, name = 'V5_split_type_unit', type_signature = 0x8899aabbccddeeff, type_offset = 0x001d (next unit at 0x00000024) # CHECK: 0x00000018: DW_TAG_type_unit .section .debug_types,"",@progbits @@ -207,7 +207,7 @@ .byte 0 # NULL TU_4_end: -# CHECK: 0x00000000: Type Unit: length = 0x0000001f version = 0x0004 abbr_offset = 0x0000 addr_size = 0x08 name = 'V4_type_unit' type_signature = 0x0011223344556677 type_offset = 0x001c (next unit at 0x00000023) +# CHECK: 0x00000000: Type Unit: length = 0x0000001f, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x08, name = 'V4_type_unit', type_signature = 0x0011223344556677, type_offset = 0x001c (next unit at 0x00000023) # CHECK: 0x00000017: DW_TAG_type_unit .section .debug_line,"",@progbits Index: llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll =================================================================== --- llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll +++ llvm/test/DebugInfo/X86/gnu-public-names-gmlt.ll @@ -21,7 +21,7 @@ ; GPUB-NEXT: "f3" ; GPUB: .debug_gnu_pubtypes contents: -; GPUB-NEXT: length = 0x0000000e version = 0x0002 unit_offset = 0x00000000 +; GPUB-NEXT: length = 0x0000000e, version = 0x0002, unit_offset = 0x00000000 ; GPUB-NEXT: Name ; NONE-NOT: .debug_pubnames contents: Index: llvm/test/DebugInfo/X86/gnu-public-names-tu.ll =================================================================== --- llvm/test/DebugInfo/X86/gnu-public-names-tu.ll +++ llvm/test/DebugInfo/X86/gnu-public-names-tu.ll @@ -17,13 +17,13 @@ ; CHECK-LABEL: .debug_gnu_pubnames contents: -; CHECK-NEXT: length = {{.*}} version = 0x0002 unit_offset = 0x00000000 unit_size = {{.*}} +; CHECK-NEXT: length = {{.*}}, version = 0x0002, unit_offset = 0x00000000, unit_size = {{.*}} ; CHECK-NEXT: Offset Linkage Kind Name ; CHECK-NEXT: [[CU]] EXTERNAL TYPE "ns" ; CHECK-NEXT: {{.*}} EXTERNAL VARIABLE "b" ; CHECK-LABEL: debug_gnu_pubtypes contents: -; CHECK-NEXT: length = {{.*}} version = 0x0002 unit_offset = 0x00000000 unit_size = {{.*}} +; CHECK-NEXT: length = {{.*}}, version = 0x0002, unit_offset = 0x00000000, unit_size = {{.*}} ; CHECK-NEXT: Offset Linkage Kind Name ; CHECK-NEXT: [[BAR]] EXTERNAL TYPE "bar" ; CHECK-NEXT: [[CU]] EXTERNAL TYPE "ns::foo" Index: llvm/test/DebugInfo/X86/gnu-public-names.ll =================================================================== --- llvm/test/DebugInfo/X86/gnu-public-names.ll +++ llvm/test/DebugInfo/X86/gnu-public-names.ll @@ -239,7 +239,7 @@ ; CHECK: DW_AT_name {{.*}} "global_function" ; CHECK-LABEL: .debug_gnu_pubnames contents: -; CHECK-NEXT: length = {{.*}} version = 0x0002 unit_offset = 0x00000000 unit_size = {{.*}} +; CHECK-NEXT: length = {{.*}}, version = 0x0002, unit_offset = 0x00000000, unit_size = {{.*}} ; CHECK-NEXT: Offset Linkage Kind Name ; CHECK-NEXT: [[GLOBAL_FUNC]] EXTERNAL FUNCTION "global_function" ; CHECK-NEXT: [[NS]] EXTERNAL TYPE "ns" Index: llvm/test/DebugInfo/dwarfdump-pubnames.test =================================================================== --- llvm/test/DebugInfo/dwarfdump-pubnames.test +++ llvm/test/DebugInfo/dwarfdump-pubnames.test @@ -2,7 +2,7 @@ RUN: --debug-pubnames | FileCheck %s CHECK: .debug_pubnames contents: -CHECK: length = 0x000000a1 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000141 +CHECK: length = 0x000000a1, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000141 CHECK: Offset Name CHECK: 0x00000098 "global_namespace_variable" Index: llvm/test/DebugInfo/dwarfdump-type-units.test =================================================================== --- llvm/test/DebugInfo/dwarfdump-type-units.test +++ llvm/test/DebugInfo/dwarfdump-type-units.test @@ -18,7 +18,7 @@ LONG: 0x00000000: Type Unit: {{.*}} name = SHORT-NOT: Type Unit SHORT: name = -CHECK-SAME: 'bar' type_signature = [[BAR_SIG]] +CHECK-SAME: 'bar', type_signature = [[BAR_SIG]] SHORT-SAME: length = LONG-SAME: type_offset = 0x[[BAR_OFF:[0-9a-f]*]] (next unit at LONG: DW_TAG_type_unit @@ -28,7 +28,7 @@ LONG: 0x00000000: Type Unit: {{.*}} name = SHORT: name = -CHECK-SAME: 'foo' type_signature = [[FOO_SIG]] +CHECK-SAME: 'foo', type_signature = [[FOO_SIG]] LONG-SAME: type_offset = 0x[[FOO_OFF:[0-9a-f]*]] (next unit at LONG: DW_TAG_type_unit LONG-NOT: NULL Index: llvm/test/DebugInfo/dwarfdump-zlib.test =================================================================== --- llvm/test/DebugInfo/dwarfdump-zlib.test +++ llvm/test/DebugInfo/dwarfdump-zlib.test @@ -10,7 +10,7 @@ // the decompression correctly and result is the same. This and above also checks // that sections names are properly shown in zlib-gnu style (without additional 'z' prefix). CHECK: .debug_info contents -CHECK: 0x00000000: Compile Unit: length = 0x00000144 version = 0x0004 abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x00000148) +CHECK: 0x00000000: Compile Unit: length = 0x00000144, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x00000148) // Also check that relocations in the .zdebug sections are handled correctly: CHECK: DW_AT_ranges {{.*}} (0x00000000{{$}} Index: llvm/test/DebugInfo/typeunit-header.test =================================================================== --- llvm/test/DebugInfo/typeunit-header.test +++ llvm/test/DebugInfo/typeunit-header.test @@ -10,6 +10,6 @@ and displays it. CHECK: .debug_types contents: -CHECK: 0x00000000: Type Unit: length = 0x00000019 version = 0x0004 abbr_offset = 0x0000 addr_size = 0x08 name = '' type_signature = 0x0011223344556677 type_offset = 0x0019 (next unit at 0x0000001d) +CHECK: 0x00000000: Type Unit: length = 0x00000019, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x08, name = '', type_signature = 0x0011223344556677, type_offset = 0x0019 (next unit at 0x0000001d) CHECK: 0x00000017: DW_TAG_type_unit [1] * CHECK: DW_AT_visibility [DW_FORM_data1] (DW_VIS_local) Index: llvm/test/MC/WebAssembly/dwarfdump.ll =================================================================== --- llvm/test/MC/WebAssembly/dwarfdump.ll +++ llvm/test/MC/WebAssembly/dwarfdump.ll @@ -1,7 +1,7 @@ ; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s ; CHECK: .debug_info contents: -; CHECK-NEXT: 0x00000000: Compile Unit: length = 0x0000006e version = 0x0004 abbr_offset = 0x0000 addr_size = 0x04 (next unit at 0x00000072) +; CHECK-NEXT: 0x00000000: Compile Unit: length = 0x0000006e, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x04 (next unit at 0x00000072) ; CHECK: 0x0000000b: DW_TAG_compile_unit ; CHECK-NEXT: DW_AT_producer ("clang version 6.0.0 (trunk 315924) (llvm/trunk 315960)") Index: llvm/test/tools/dsymutil/ARM/obfuscated.test =================================================================== --- llvm/test/tools/dsymutil/ARM/obfuscated.test +++ llvm/test/tools/dsymutil/ARM/obfuscated.test @@ -119,19 +119,19 @@ CHECK: length: 0x00000000 CHECK: .debug_pubnames contents: -CHECK: length = 0x00000017 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000044 +CHECK: length = 0x00000017, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000044 CHECK: 0x0000002e "main" -CHECK: length = 0x00000016 version = 0x0002 unit_offset = 0x00000044 unit_size = 0x00000044 +CHECK: length = 0x00000016, version = 0x0002, unit_offset = 0x00000044, unit_size = 0x00000044 CHECK: 0x0000002e "one" -CHECK: length = 0x00000016 version = 0x0002 unit_offset = 0x00000088 unit_size = 0x00000044 +CHECK: length = 0x00000016, version = 0x0002, unit_offset = 0x00000088, unit_size = 0x00000044 CHECK: 0x0000002e "two" -CHECK: length = 0x00000018 version = 0x0002 unit_offset = 0x000000cc unit_size = 0x00000044 +CHECK: length = 0x00000018, version = 0x0002, unit_offset = 0x000000cc, unit_size = 0x00000044 CHECK: 0x0000002e "three" -CHECK: length = 0x00000017 version = 0x0002 unit_offset = 0x00000110 unit_size = 0x00000044 +CHECK: length = 0x00000017, version = 0x0002, unit_offset = 0x00000110, unit_size = 0x00000044 CHECK: 0x0000002e "four" -CHECK: length = 0x00000017 version = 0x0002 unit_offset = 0x00000154 unit_size = 0x00000044 +CHECK: length = 0x00000017, version = 0x0002, unit_offset = 0x00000154, unit_size = 0x00000044 CHECK: 0x0000002e "five" -CHECK: length = 0x00000016 version = 0x0002 unit_offset = 0x00000198 unit_size = 0x00000044 +CHECK: length = 0x00000016, version = 0x0002, unit_offset = 0x00000198, unit_size = 0x00000044 CHECK: 0x0000002e "six" CHECK: .apple_names contents: Index: llvm/test/tools/dsymutil/X86/basic-linking-x86.test =================================================================== --- llvm/test/tools/dsymutil/X86/basic-linking-x86.test +++ llvm/test/tools/dsymutil/X86/basic-linking-x86.test @@ -190,29 +190,29 @@ CHECK-NEXT: 0x0000000100000fa9 12 0 1 0 0 is_stmt end_sequence CHECK: .debug_pubnames contents: -CHECK-NEXT: length = 0x00000017 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000081 +CHECK-NEXT: length = 0x00000017, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000081 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000026 "main" -CHECK-NEXT: length = 0x00000036 version = 0x0002 unit_offset = 0x00000081 unit_size = 0x000000a5 +CHECK-NEXT: length = 0x00000036, version = 0x0002, unit_offset = 0x00000081, unit_size = 0x000000a5 CHECK-NEXT: Offset Name CHECK-NEXT: 0x0000002d "private_int" CHECK-NEXT: 0x00000042 "baz" CHECK-NEXT: 0x00000057 "foo" CHECK-NEXT: 0x00000086 "inc" -CHECK-NEXT: length = 0x00000026 version = 0x0002 unit_offset = 0x00000126 unit_size = 0x00000096 +CHECK-NEXT: length = 0x00000026, version = 0x0002, unit_offset = 0x00000126, unit_size = 0x00000096 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000026 "val" CHECK-NEXT: 0x00000048 "bar" CHECK-NEXT: 0x00000077 "inc" CHECK: .debug_pubtypes contents: -CHECK-NEXT: length = 0x0000001f version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000081 +CHECK-NEXT: length = 0x0000001f, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000081 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000063 "int" CHECK-NEXT: 0x00000079 "char" -CHECK-NEXT: length = 0x00000016 version = 0x0002 unit_offset = 0x00000081 unit_size = 0x000000a5 +CHECK-NEXT: length = 0x00000016, version = 0x0002, unit_offset = 0x00000081, unit_size = 0x000000a5 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000026 "int" -CHECK-NEXT: length = 0x00000016 version = 0x0002 unit_offset = 0x00000126 unit_size = 0x00000096 +CHECK-NEXT: length = 0x00000016, version = 0x0002, unit_offset = 0x00000126, unit_size = 0x00000096 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000041 "int" Index: llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test =================================================================== --- llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test +++ llvm/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test @@ -180,23 +180,23 @@ CHECK-NEXT: 0x0000000100000fb4 20 1 1 0 0 is_stmt end_sequence CHECK: .debug_pubnames contents: -CHECK-NEXT: length = 0x00000017 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000077 +CHECK-NEXT: length = 0x00000017, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000077 CHECK-NEXT: Offset Name CHECK-NEXT: 0x0000002a "main" -CHECK-NEXT: length = 0x0000002e version = 0x0002 unit_offset = 0x00000077 unit_size = 0x000000a4 +CHECK-NEXT: length = 0x0000002e, version = 0x0002, unit_offset = 0x00000077, unit_size = 0x000000a4 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000031 "baz" CHECK-NEXT: 0x00000046 "private_int" CHECK-NEXT: 0x00000067 "foo" -CHECK-NEXT: length = 0x0000001e version = 0x0002 unit_offset = 0x0000011b unit_size = 0x00000085 +CHECK-NEXT: length = 0x0000001e, version = 0x0002, unit_offset = 0x0000011b, unit_size = 0x00000085 CHECK-NEXT: Offset Name CHECK-NEXT: 0x0000002a "val" CHECK-NEXT: 0x00000050 "bar" CHECK: .debug_pubtypes contents: -CHECK-NEXT: length = 0x00000017 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000077 +CHECK-NEXT: length = 0x00000017, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000077 CHECK-NEXT: Offset Name CHECK-NEXT: 0x0000006f "char" -CHECK-NEXT: length = 0x00000016 version = 0x0002 unit_offset = 0x00000077 unit_size = 0x000000a4 +CHECK-NEXT: length = 0x00000016, version = 0x0002, unit_offset = 0x00000077, unit_size = 0x000000a4 CHECK-NEXT: Offset Name CHECK-NEXT: 0x0000002a "int" Index: llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test =================================================================== --- llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test +++ llvm/test/tools/dsymutil/X86/basic-lto-linking-x86.test @@ -179,21 +179,21 @@ CHECK: 0x0000000100000fb4 20 0 1 0 0 is_stmt end_sequence CHECK: .debug_pubnames contents: -CHECK-NEXT: length = 0x00000017 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000081 +CHECK-NEXT: length = 0x00000017, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000081 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000026 "main" -CHECK-NEXT: length = 0x0000002e version = 0x0002 unit_offset = 0x00000081 unit_size = 0x000000b9 +CHECK-NEXT: length = 0x0000002e, version = 0x0002, unit_offset = 0x00000081, unit_size = 0x000000b9 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000026 "private_int" CHECK-NEXT: 0x0000003f "baz" CHECK-NEXT: 0x00000058 "foo" -CHECK-NEXT: length = 0x0000001e version = 0x0002 unit_offset = 0x0000013a unit_size = 0x000000ac +CHECK-NEXT: length = 0x0000001e, version = 0x0002, unit_offset = 0x0000013a, unit_size = 0x000000ac CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000026 "val" CHECK-NEXT: 0x00000045 "bar" CHECK: .debug_pubtypes contents: -CHECK-NEXT: length = 0x0000001f version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000081 +CHECK-NEXT: length = 0x0000001f, version = 0x0002, unit_offset = 0x00000000, unit_size = 0x00000081 CHECK-NEXT: Offset Name CHECK-NEXT: 0x00000063 "int" CHECK-NEXT: 0x00000079 "char" Index: llvm/test/tools/dsymutil/X86/empty-CU.test =================================================================== --- llvm/test/tools/dsymutil/X86/empty-CU.test +++ llvm/test/tools/dsymutil/X86/empty-CU.test @@ -1,6 +1,6 @@ RUN: dsymutil --update -f %p/../Inputs/empty-CU.o -o - | llvm-dwarfdump -v - -debug-info | FileCheck %s CHECK: .debug_info contents: -CHECK: 0x00000000: Compile Unit: length = 0x00000008 version = 0x0003 abbr_offset = 0x0000 addr_size = 0x04 (next unit at 0x0000000c) +CHECK: 0x00000000: Compile Unit: length = 0x00000008, version = 0x0003, abbr_offset = 0x0000, addr_size = 0x04 (next unit at 0x0000000c) CHECK: 0x0000000b: DW_TAG_compile_unit [1] Index: llvm/test/tools/dsymutil/X86/generate-empty-CU.test =================================================================== --- llvm/test/tools/dsymutil/X86/generate-empty-CU.test +++ llvm/test/tools/dsymutil/X86/generate-empty-CU.test @@ -15,14 +15,14 @@ ... .debug_info contents: -CHECK: Compile Unit: length = 0x0000007d version = 0x0002 abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x00000081) +CHECK: Compile Unit: length = 0x0000007d, version = 0x0002, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x00000081) CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "basic1.c" CHECK: DW_TAG_subprogram DW_AT_name {{.*}} "main" -CHECK: 0x00000081: Compile Unit: length = 0x00000089 version = 0x0002 abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x0000010e) +CHECK: 0x00000081: Compile Unit: length = 0x00000089, version = 0x0002, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x0000010e) CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "basic3.c" Index: llvm/test/tools/llvm-dwarfdump/X86/debug_loclists_nouse.s =================================================================== --- llvm/test/tools/llvm-dwarfdump/X86/debug_loclists_nouse.s +++ llvm/test/tools/llvm-dwarfdump/X86/debug_loclists_nouse.s @@ -1,7 +1,7 @@ # RUN: llvm-mc %s -filetype obj -triple x86_64-pc-linux -o %t.o # RUN: llvm-dwarfdump %t.o | FileCheck %s -# CHECK: 0x00000000: Compile Unit: length = 0x00000009 version = 0x0005 unit_type = DW_UT_compile abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x0000000d) +# CHECK: 0x00000000: Compile Unit: length = 0x00000009, version = 0x0005, unit_type = DW_UT_compile, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x0000000d) # CHECK: 0x0000000c: DW_TAG_compile_unit .section .debug_abbrev,"",@progbits Index: llvm/test/tools/llvm-dwarfdump/X86/lookup.s =================================================================== --- llvm/test/tools/llvm-dwarfdump/X86/lookup.s +++ llvm/test/tools/llvm-dwarfdump/X86/lookup.s @@ -20,7 +20,7 @@ # RUN: | llvm-dwarfdump -lookup=0x14 - | \ # RUN: FileCheck %s -check-prefixes=CHECK,C -# CHECK: Compile Unit: length = 0x00000060 version = 0x0004 abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x00000064) +# CHECK: Compile Unit: length = 0x00000060, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x08 (next unit at 0x00000064) # CHECK: DW_TAG_compile_unit # CHECK: DW_AT_name ("foo.c") Index: llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test =================================================================== --- llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test +++ llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test @@ -61,25 +61,25 @@ CHECK: .debug_info.dwo contents: CHECK: [[AOFF:0x[0-9a-f]*]]: -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004 CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "c.cpp" CHECK: DW_TAG_subprogram CHECK: DW_AT_name {{.*}} "c" -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004 CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "e.cpp" CHECK: DW_TAG_subprogram CHECK: DW_AT_name {{.*}} "e" -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004 CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "a.cpp" CHECK: DW_TAG_subprogram CHECK: DW_AT_name {{.*}} "a" -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004 CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "b.cpp" CHECK: DW_TAG_subprogram @@ -87,7 +87,7 @@ CHECK: DW_TAG_subprogram CHECK: DW_AT_name {{.*}} "main" -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004 CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "d.cpp" CHECK: DW_TAG_subprogram Index: llvm/test/tools/llvm-dwp/X86/info-v5.s =================================================================== --- llvm/test/tools/llvm-dwp/X86/info-v5.s +++ llvm/test/tools/llvm-dwp/X86/info-v5.s @@ -6,7 +6,7 @@ # RUN: llvm-dwarfdump -v %t.dwp | FileCheck %s #CHECK-DAG: .debug_info.dwo contents: -#CHECK: 0x00000000: Compile Unit: length = 0x00000050 version = 0x0005 unit_type = DW_UT_split_compile abbr_offset = 0x0000 addr_size = 0x08 DWO_id = [[DWOID:.*]] (next unit at 0x00000054) +#CHECK: 0x00000000: Compile Unit: length = 0x00000050, version = 0x0005, unit_type = DW_UT_split_compile, abbr_offset = 0x0000, addr_size = 0x08, DWO_id = [[DWOID:.*]] (next unit at 0x00000054) # CHECK-DAG: .debug_cu_index contents: # CHECK: version = 2 slots = 2 Index: llvm/test/tools/llvm-dwp/X86/merge.test =================================================================== --- llvm/test/tools/llvm-dwp/X86/merge.test +++ llvm/test/tools/llvm-dwp/X86/merge.test @@ -27,16 +27,16 @@ CHECK: .debug_info.dwo contents: CHECK: [[COFF:0x[0-9a-f]*]]: -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 abbr_offset = -CHECK: 0x[[CAOFF]] addr_size = 0x08 (next unit at [[AOFF:.*]]) +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004, abbr_offset = +CHECK: 0x[[CAOFF]], addr_size = 0x08 (next unit at [[AOFF:.*]]) CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOC:.*]]) CHECK: [[AOFF]]: -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 abbr_offset = -CHECK: 0x[[AAOFF]] addr_size = 0x08 (next unit at [[BOFF:.*]]) +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004, abbr_offset = +CHECK: 0x[[AAOFF]], addr_size = 0x08 (next unit at [[BOFF:.*]]) CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOA:.*]]) CHECK: [[BOFF]]: -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 abbr_offset = -CHECK: 0x[[BAOFF]] addr_size = 0x08 (next unit at [[XOFF:.*]]) +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004, abbr_offset = +CHECK: 0x[[BAOFF]], addr_size = 0x08 (next unit at [[XOFF:.*]]) CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOB:.*]]) CHECK-LABEL: .debug_cu_index Index: llvm/test/tools/llvm-dwp/X86/simple.test =================================================================== --- llvm/test/tools/llvm-dwp/X86/simple.test +++ llvm/test/tools/llvm-dwp/X86/simple.test @@ -29,8 +29,8 @@ CHECK: .debug_info.dwo contents: CHECK: [[AOFF:0x[0-9a-f]*]]: -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 abbr_offset = -CHECK: 0x[[AAOFF]] addr_size = 0x08 (next unit at [[BOFF:.*]]) +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004, abbr_offset = +CHECK: 0x[[AAOFF]], addr_size = 0x08 (next unit at [[BOFF:.*]]) CHECK: DW_TAG_compile_unit CHECK: DW_AT_name {{.*}} "a.cpp" CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOA:.*]]) @@ -41,8 +41,8 @@ TYPES: DW_AT_signature {{.*}} ([[FOOSIG:.*]]) CHECK: [[BOFF]]: -CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 abbr_offset = -CHECK: 0x[[BAOFF]] addr_size = 0x08 (next unit at [[XOFF:.*]]) +CHECK-LABEL: Compile Unit: length = {{.*}}, version = 0x0004, abbr_offset = +CHECK: 0x[[BAOFF]], addr_size = 0x08 (next unit at [[XOFF:.*]]) CHECK: DW_AT_name {{.*}} "b.cpp" CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOB:.*]]) CHECK: DW_TAG_structure_type @@ -55,14 +55,14 @@ NOTYP-NOT: .debug_types.dwo contents: TYPES-LABEL: .debug_types.dwo contents: TYPES: [[FOOUOFF:0x[0-9a-f]*]]: -TYPES-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = -TYPES: 0x[[AAOFF]] addr_size = 0x08 name = 'foo' type_signature = [[FOOSIG]] type_offset = 0x[[FOOOFF:.*]] (next unit at [[BARUOFF:.*]]) +TYPES-LABEL: Type Unit: length = 0x00000020, version = 0x0004, abbr_offset = +TYPES: 0x[[AAOFF]], addr_size = 0x08, name = 'foo', type_signature = [[FOOSIG]], type_offset = 0x[[FOOOFF:.*]] (next unit at [[BARUOFF:.*]]) TYPES: DW_TAG_type_unit TYPES: [[FOOOFF]]: DW_TAG_structure_type TYPES: DW_AT_name {{.*}} "foo" TYPES: [[BARUOFF]]: -TYPES-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = -TYPES: 0x[[BAOFF]] addr_size = 0x08 name = 'bar' type_signature = [[BARSIG]] type_offset = 0x001e (next unit at [[XUOFF:.*]]) +TYPES-LABEL: Type Unit: length = 0x00000020, version = 0x0004, abbr_offset = +TYPES: 0x[[BAOFF]], addr_size = 0x08, name = 'bar', type_signature = [[BARSIG]], type_offset = 0x001e (next unit at [[XUOFF:.*]]) TYPES: DW_TAG_type_unit TYPES: 0x00000042: DW_TAG_structure_type TYPES: DW_AT_name {{.*}} "bar" Index: llvm/test/tools/llvm-dwp/X86/type_dedup.test =================================================================== --- llvm/test/tools/llvm-dwp/X86/type_dedup.test +++ llvm/test/tools/llvm-dwp/X86/type_dedup.test @@ -18,20 +18,20 @@ CHECK-LABEL: .debug_types.dwo contents: CHECK: [[COMMONUOFF:0x[0-9a-f]*]]: -CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = -CHECK: 0x0000 addr_size = 0x08 name = 'common' type_signature = [[COMMONSIG:0x[0-9a-f]*]] type_offset = 0x[[COMMONOFF:.*]] (next unit at [[AUOFF:.*]]) +CHECK-LABEL: Type Unit: length = 0x00000020, version = 0x0004, abbr_offset = +CHECK: 0x0000, addr_size = 0x08, name = 'common', type_signature = [[COMMONSIG:0x[0-9a-f]*]], type_offset = 0x[[COMMONOFF:.*]] (next unit at [[AUOFF:.*]]) CHECK: DW_TAG_type_unit CHECK: [[COMMONOFF]]: DW_TAG_structure_type CHECK: DW_AT_name {{.*}} "common" CHECK: [[AUOFF]]: -CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = -CHECK: 0x0000 addr_size = 0x08 name = 'adistinct' type_signature = [[ASIG:0x[0-9a-f]*]] type_offset = 0x[[AOFF:.*]] (next unit at [[BUOFF:.*]]) +CHECK-LABEL: Type Unit: length = 0x00000020, version = 0x0004, abbr_offset = +CHECK: 0x0000, addr_size = 0x08, name = 'adistinct', type_signature = [[ASIG:0x[0-9a-f]*]], type_offset = 0x[[AOFF:.*]] (next unit at [[BUOFF:.*]]) CHECK: DW_TAG_type_unit CHECK: 0x00000042: DW_TAG_structure_type CHECK: DW_AT_name {{.*}} "adistinct" CHECK: [[BUOFF]]: -CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = -CHECK: 0x{{.*}} addr_size = 0x08 name = 'bdistinct' type_signature = [[BSIG:0x[0-9a-f]*]] type_offset = 0x[[BOFF:.*]] (next unit at [[XUOFF:.*]]) +CHECK-LABEL: Type Unit: length = 0x00000020, version = 0x0004, abbr_offset = +CHECK: 0x{{.*}}, addr_size = 0x08, name = 'bdistinct', type_signature = [[BSIG:0x[0-9a-f]*]], type_offset = 0x[[BOFF:.*]] (next unit at [[XUOFF:.*]]) CHECK: DW_TAG_type_unit CHECK: 0x00000066: DW_TAG_structure_type CHECK: DW_AT_name {{.*}} "bdistinct"