From 80a90f9ff348625fa6c92f535529e6374bd458e9 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sat, 22 Dec 2018 08:43:08 +0000 Subject: [PATCH] llvm-dwarfdump: Remove extraneous space between '(' and 'indexed' When dumping string or address indexes git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@349997 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/DebugInfo/DWARF/DWARFFormValue.cpp | 4 +-- test/CodeGen/X86/debug-loclists.ll | 2 +- test/DebugInfo/Generic/string-offsets-form.ll | 2 +- test/DebugInfo/X86/debug_addr.ll | 2 +- .../DebugInfo/X86/dwarfdump-str-offsets-dwp.s | 20 +++++------ .../X86/dwarfdump-str-offsets-macho.s | 24 ++++++------- test/DebugInfo/X86/dwarfdump-str-offsets.s | 34 +++++++++---------- test/DebugInfo/X86/fission-cu.ll | 10 +++--- test/DebugInfo/X86/generate-odr-hash.ll | 2 +- .../X86/string-offsets-multiple-cus.ll | 10 +++--- .../X86/string-offsets-table-order.ll | 6 ++-- test/DebugInfo/X86/string-offsets-table.ll | 12 +++---- 12 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lib/DebugInfo/DWARF/DWARFFormValue.cpp b/lib/DebugInfo/DWARF/DWARFFormValue.cpp index 90e8794c9d8..241f9a70603 100644 --- a/lib/DebugInfo/DWARF/DWARFFormValue.cpp +++ b/lib/DebugInfo/DWARF/DWARFFormValue.cpp @@ -370,7 +370,7 @@ void DWARFFormValue::dump(raw_ostream &OS, DIDumpOptions DumpOpts) const { case DW_FORM_addrx3: case DW_FORM_addrx4: case DW_FORM_GNU_addr_index: { - AddrOS << format(" indexed (%8.8x) address = ", (uint32_t)UValue); + AddrOS << format("indexed (%8.8x) address = ", (uint32_t)UValue); if (U == nullptr) OS << ""; else if (Optional A = @@ -467,7 +467,7 @@ void DWARFFormValue::dump(raw_ostream &OS, DIDumpOptions DumpOpts) const { case DW_FORM_strx4: case DW_FORM_GNU_str_index: if (DumpOpts.Verbose) - OS << format(" indexed (%8.8x) string = ", (uint32_t)UValue); + OS << format("indexed (%8.8x) string = ", (uint32_t)UValue); dumpString(OS); break; case DW_FORM_GNU_strp_alt: diff --git a/test/CodeGen/X86/debug-loclists.ll b/test/CodeGen/X86/debug-loclists.ll index 874cdc196e4..20bc0c40378 100644 --- a/test/CodeGen/X86/debug-loclists.ll +++ b/test/CodeGen/X86/debug-loclists.ll @@ -5,7 +5,7 @@ ; CHECK-NEXT: DW_AT_location [DW_FORM_sec_offset] (0x0000000c ; CHECK-NEXT: [0x0000000000000000, 0x0000000000000004): DW_OP_breg5 RDI+0 ; CHECK-NEXT: [0x0000000000000004, 0x0000000000000012): DW_OP_breg3 RBX+0) -; CHECK-NEXT: DW_AT_name [DW_FORM_strx1] ( indexed (0000000e) string = "a") +; CHECK-NEXT: DW_AT_name [DW_FORM_strx1] (indexed (0000000e) string = "a") ; CHECK-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/folder{{\\|\/}}test.cc") ; CHECK-NEXT: DW_AT_decl_line [DW_FORM_data1] (6) ; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0040 => {0x00000040} "A") diff --git a/test/DebugInfo/Generic/string-offsets-form.ll b/test/DebugInfo/Generic/string-offsets-form.ll index 31e5de45884..7aec82f12ab 100644 --- a/test/DebugInfo/Generic/string-offsets-form.ll +++ b/test/DebugInfo/Generic/string-offsets-form.ll @@ -16,7 +16,7 @@ ; ; CHECK: .debug_info contents: ; CHECK-NOT: DW_FORM_strx2 -; CHECK: DW_AT_name [DW_FORM_strx2] ( indexed (00000100) string = +; CHECK: DW_AT_name [DW_FORM_strx2] (indexed (00000100) string = ; ModuleID = 'enum.cpp' source_filename = "enum.cpp" diff --git a/test/DebugInfo/X86/debug_addr.ll b/test/DebugInfo/X86/debug_addr.ll index 64a79549fb1..e6dbe7d029d 100644 --- a/test/DebugInfo/X86/debug_addr.ll +++ b/test/DebugInfo/X86/debug_addr.ll @@ -32,7 +32,7 @@ ; DWARF5-NOT: DW_TAG_{{.*}} ; DWARF5: DW_AT_GNU_dwo_name{{.*}}test.dwo ; DWARF5: DW_AT_addr_base{{.*}}0x00000008 -; DWARF5: DW_AT_low_pc [DW_FORM_addrx] ( indexed (00000000) address = 0x0000000000000000 ".text") +; DWARF5: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000000) address = 0x0000000000000000 ".text") ; DWARF5: .debug_addr contents: ; DWARF5-NEXT: 0x00000000: Addr Section: length = 0x0000000c, version = 0x0005, addr_size = 0x04, seg_size = 0x00 ; DWARF5-NEXT: Addrs: [ diff --git a/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s b/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s index fb095e3ebc2..6620beaadd8 100644 --- a/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s +++ b/test/DebugInfo/X86/dwarfdump-str-offsets-dwp.s @@ -291,33 +291,33 @@ TU2_5_end: # CHECK: Compile Unit # CHECK-NOT: NULL # CHECK: DW_TAG_compile_unit -# CHECK-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer") -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1") -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1") +# CHECK-NEXT: DW_AT_producer [DW_FORM_strx] (indexed (00000000) string = "Handmade DWARF producer") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "Compile_Unit_1") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000002) string = "/home/test/CU1") # CHECK-NOT: NULL # CHECK: Compile Unit # CHECK-NOT: NULL # CHECK: DW_TAG_compile_unit -# CHECK-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer") -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2") -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2") +# CHECK-NEXT: DW_AT_producer [DW_FORM_strx] (indexed (00000000) string = "Handmade DWARF producer") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "Compile_Unit_2") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000002) string = "/home/test/CU2") # # CHECK: Type Unit # CHECK-NOT: NULL # CHECK: DW_TAG_type_unit -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000003) string = "Type_Unit_1") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000003) string = "Type_Unit_1") # CHECK-NOT: NULL # CHECK: DW_TAG_structure_type -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000004) string = "MyStruct_1") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000004) string = "MyStruct_1") # # CHECK: Type Unit # CHECK-NOT: NULL # CHECK: DW_TAG_type_unit -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000003) string = "Type_Unit_2") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000003) string = "Type_Unit_2") # CHECK-NOT: NULL # CHECK: DW_TAG_structure_type -# CHECK-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000004) string = "MyStruct_2") +# CHECK-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000004) string = "MyStruct_2") # Verify the correct offets of the compile and type units contributions in the # index tables. diff --git a/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s b/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s index b2b5104862e..1332a94ec3c 100644 --- a/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s +++ b/test/DebugInfo/X86/dwarfdump-str-offsets-macho.s @@ -216,37 +216,37 @@ TU_5_end: # COMMON: .debug_info contents: # COMMON-NOT: contents: # COMMON: DW_TAG_compile_unit -# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer") -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1") +# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] (indexed (00000000) string = "Handmade DWARF producer") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "Compile_Unit_1") # COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008) -# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1") +# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] (indexed (00000002) string = "/home/test/CU1") # COMMON-NOT: NULL # COMMON: DW_TAG_subprogram -# COMMON-NEXT: DW_AT_name [DW_FORM_strx1] ( indexed (00000003) string = "MyFunc") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx1] (indexed (00000003) string = "MyFunc") # COMMON-NOT: NULL # COMMON: DW_TAG_variable -# COMMON-NEXT: DW_AT_name [DW_FORM_strx2] ( indexed (00000004) string = "MyVar1") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx2] (indexed (00000004) string = "MyVar1") # COMMON-NOT: NULL # COMMON: DW_TAG_variable -# COMMON-NEXT: DW_AT_name [DW_FORM_strx3] ( indexed (00000005) string = "MyVar2") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx3] (indexed (00000005) string = "MyVar2") # COMMON-NOT: NULL # COMMON: DW_TAG_variable -# COMMON-NEXT: DW_AT_name [DW_FORM_strx4] ( indexed (00000006) string = "MyVar3") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx4] (indexed (00000006) string = "MyVar3") # # Second compile unit (b.cpp) # COMMON: DW_TAG_compile_unit -# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer") -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2") +# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] (indexed (00000000) string = "Handmade DWARF producer") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "Compile_Unit_2") # COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000038) -# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2") +# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] (indexed (00000002) string = "/home/test/CU2") # # The type unit # COMMON: .debug_types contents: # COMMON: DW_TAG_type_unit -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000000) string = "Type_Unit") # COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000058) # COMMON: DW_TAG_structure_type -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "MyStruct") # # The .debug_str_offsets section # COMMON: .debug_str_offsets contents: diff --git a/test/DebugInfo/X86/dwarfdump-str-offsets.s b/test/DebugInfo/X86/dwarfdump-str-offsets.s index 2f4215a04ba..230c6608506 100644 --- a/test/DebugInfo/X86/dwarfdump-str-offsets.s +++ b/test/DebugInfo/X86/dwarfdump-str-offsets.s @@ -334,51 +334,51 @@ TU_split_5_end: # COMMON: .debug_info contents: # COMMON-NOT: contents: # COMMON: DW_TAG_compile_unit -# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer") -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_1") +# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] (indexed (00000000) string = "Handmade DWARF producer") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "Compile_Unit_1") # COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008) -# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU1") +# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] (indexed (00000002) string = "/home/test/CU1") # COMMON-NOT: NULL # COMMON: DW_TAG_subprogram -# COMMON-NEXT: DW_AT_name [DW_FORM_strx1] ( indexed (00000003) string = "MyFunc") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx1] (indexed (00000003) string = "MyFunc") # COMMON-NOT: NULL # COMMON: DW_TAG_variable -# COMMON-NEXT: DW_AT_name [DW_FORM_strx2] ( indexed (00000004) string = "MyVar1") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx2] (indexed (00000004) string = "MyVar1") # COMMON-NOT: NULL # COMMON: DW_TAG_variable -# COMMON-NEXT: DW_AT_name [DW_FORM_strx3] ( indexed (00000005) string = "MyVar2") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx3] (indexed (00000005) string = "MyVar2") # COMMON-NOT: NULL # COMMON: DW_TAG_variable -# COMMON-NEXT: DW_AT_name [DW_FORM_strx4] ( indexed (00000006) string = "MyVar3") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx4] (indexed (00000006) string = "MyVar3") # # Second compile unit (b.cpp) # COMMON: DW_TAG_compile_unit -# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade DWARF producer") -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "Compile_Unit_2") +# COMMON-NEXT: DW_AT_producer [DW_FORM_strx] (indexed (00000000) string = "Handmade DWARF producer") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "Compile_Unit_2") # COMMON-NEXT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000038) -# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/CU2") +# COMMON-NEXT: DW_AT_comp_dir [DW_FORM_strx] (indexed (00000002) string = "/home/test/CU2") # # The split CU # SPLIT: .debug_info.dwo contents: # SPLIT-NOT: contents: # SPLIT: DW_TAG_compile_unit -# SPLIT-NEXT: DW_AT_producer [DW_FORM_strx] ( indexed (00000000) string = "Handmade split DWARF producer") -# SPLIT-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "V5_split_compile_unit") -# SPLIT-NEXT: DW_AT_comp_dir [DW_FORM_strx] ( indexed (00000002) string = "/home/test/splitCU") +# SPLIT-NEXT: DW_AT_producer [DW_FORM_strx] (indexed (00000000) string = "Handmade split DWARF producer") +# SPLIT-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "V5_split_compile_unit") +# SPLIT-NEXT: DW_AT_comp_dir [DW_FORM_strx] (indexed (00000002) string = "/home/test/splitCU") # # The type unit # COMMON: .debug_types contents: # COMMON: DW_TAG_type_unit -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000000) string = "Type_Unit") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000000) string = "Type_Unit") # COMMON: DW_TAG_structure_type -# COMMON-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000001) string = "MyStruct") +# COMMON-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000001) string = "MyStruct") # # The split type unit # SPLIT: .debug_types.dwo contents: # SPLIT: DW_TAG_type_unit -# SPLIT-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000003) string = "V5_split_type_unit") +# SPLIT-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000003) string = "V5_split_type_unit") # SPLIT: DW_TAG_structure_type -# SPLIT-NEXT: DW_AT_name [DW_FORM_strx] ( indexed (00000004) string = "V5_split_Mystruct") +# SPLIT-NEXT: DW_AT_name [DW_FORM_strx] (indexed (00000004) string = "V5_split_Mystruct") # # The .debug_str_offsets section # COMMON: .debug_str_offsets contents: diff --git a/test/DebugInfo/X86/fission-cu.ll b/test/DebugInfo/X86/fission-cu.ll index 95669b6dd59..d5cca771435 100644 --- a/test/DebugInfo/X86/fission-cu.ll +++ b/test/DebugInfo/X86/fission-cu.ll @@ -65,23 +65,23 @@ source_filename = "test/DebugInfo/X86/fission-cu.ll" ; Check that the rest of the compile units have information. ; CHECK: .debug_info.dwo contents: ; CHECK: DW_TAG_compile_unit -; CHECK: DW_AT_producer [DW_FORM_GNU_str_index] ( indexed (00000002) string = "clang version 3.3 (trunk 169021) (llvm/trunk 169020)") +; CHECK: DW_AT_producer [DW_FORM_GNU_str_index] (indexed (00000002) string = "clang version 3.3 (trunk 169021) (llvm/trunk 169020)") ; CHECK: DW_AT_language [DW_FORM_data2] (DW_LANG_C99) -; CHECK: DW_AT_name [DW_FORM_GNU_str_index] ( indexed (00000003) string = "baz.c") -; CHECK: DW_AT_GNU_dwo_name [DW_FORM_GNU_str_index] ( indexed (00000004) string = "baz.dwo") +; CHECK: DW_AT_name [DW_FORM_GNU_str_index] (indexed (00000003) string = "baz.c") +; CHECK: DW_AT_GNU_dwo_name [DW_FORM_GNU_str_index] (indexed (00000004) string = "baz.dwo") ; CHECK-NOT: DW_AT_low_pc ; CHECK-NOT: DW_AT_stmt_list ; CHECK-NOT: DW_AT_comp_dir ; CHECK: DW_AT_GNU_dwo_id [DW_FORM_data8] (0x1f1f859683d49324) ; CHECK: DW_TAG_variable -; CHECK: DW_AT_name [DW_FORM_GNU_str_index] ( indexed (00000000) string = "a") +; CHECK: DW_AT_name [DW_FORM_GNU_str_index] (indexed (00000000) string = "a") ; CHECK: DW_AT_type [DW_FORM_ref4] (cu + 0x{{[0-9a-f]*}} => {[[TYPE:0x[0-9a-f]*]]} ; CHECK: DW_AT_external [DW_FORM_flag_present] (true) ; CHECK: DW_AT_decl_file [DW_FORM_data1] (0x01) ; CHECK: DW_AT_decl_line [DW_FORM_data1] (1) ; CHECK: DW_AT_location [DW_FORM_exprloc] (DW_OP_GNU_addr_index 0x0) ; CHECK: [[TYPE]]: DW_TAG_base_type -; CHECK: DW_AT_name [DW_FORM_GNU_str_index] ( indexed (00000001) string = "int") +; CHECK: DW_AT_name [DW_FORM_GNU_str_index] (indexed (00000001) string = "int") ; CHECK: .debug_str contents: ; CHECK: 0x00000000: "/usr/local/google/home/echristo/tmp" diff --git a/test/DebugInfo/X86/generate-odr-hash.ll b/test/DebugInfo/X86/generate-odr-hash.ll index f2776f37a8a..8a46f6db6d8 100644 --- a/test/DebugInfo/X86/generate-odr-hash.ll +++ b/test/DebugInfo/X86/generate-odr-hash.ll @@ -80,7 +80,7 @@ ; CHECK-NOT: type_signature ; CHECK-LABEL: type_signature = 0x1d02f3be30cc5688 ; CHECK: DW_TAG_structure_type -; FISSION-NEXT: DW_AT_name {{.*}} ( indexed {{.*}} "bar" +; FISSION-NEXT: DW_AT_name {{.*}} (indexed {{.*}} "bar" ; SINGLE-NEXT: DW_AT_name {{.*}} "bar" ; Check that we generate a hash for fluffy and the value. diff --git a/test/DebugInfo/X86/string-offsets-multiple-cus.ll b/test/DebugInfo/X86/string-offsets-multiple-cus.ll index 7851dbfefd5..785bbec4481 100644 --- a/test/DebugInfo/X86/string-offsets-multiple-cus.ll +++ b/test/DebugInfo/X86/string-offsets-multiple-cus.ll @@ -43,21 +43,21 @@ ; TYPEUNITS-NOT: NULL ; TYPEUNITS: DW_TAG_enumerator ; TYPEUNITS-NOT: {{DW_TAG|NULL}} -; TYPEUNITS: DW_AT_name [DW_FORM_strx1] ( indexed (00000005) string = "b") +; TYPEUNITS: DW_AT_name [DW_FORM_strx1] (indexed (00000005) string = "b") ; TYPEUNITS-NOT: contents: ; TYPEUNITS: DW_TAG_type_unit ; TYPEUNITS-NOT: {{DW_TAG|NULL}} ; TYPEUNITS: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x[[CU1_STROFF]]) ; TYPEUNITS-NOT: NULL ; TYPEUNITS: DW_TAG_enumeration_type -; TYPEUNITS: DW_AT_name [DW_FORM_strx1] ( indexed (0000000d) string = "E2") +; TYPEUNITS: DW_AT_name [DW_FORM_strx1] (indexed (0000000d) string = "E2") ; TYPEUNITS-NOT: contents: ; TYPEUNITS: DW_TAG_type_unit ; TYPEUNITS-NOT: {{DW_TAG|NULL}} ; TYPEUNITS: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x[[CU1_STROFF]]) ; TYPEUNITS-NOT: NULL ; TYPEUNITS: DW_TAG_enumeration_type -; TYPEUNITS: DW_AT_name [DW_FORM_strx1] ( indexed (00000013) string = "E3") +; TYPEUNITS: DW_AT_name [DW_FORM_strx1] (indexed (00000013) string = "E3") ; CU 1 ; BOTH-NOT: .contents: @@ -74,7 +74,7 @@ ; BOTH-NOT: NULL ; BOTH: DW_TAG_variable ; BOTH-NOT: {{DW_TAG|NULL}} -; BOTH: DW_AT_name [DW_FORM_strx1] ( indexed (00000009) string = "glob2") +; BOTH: DW_AT_name [DW_FORM_strx1] (indexed (00000009) string = "glob2") ; ; CU 3 ; BOTH-NOT: contents: @@ -84,7 +84,7 @@ ; BOTH-NOT: NULL ; BOTH: DW_TAG_variable ; BOTH-NOT: {{DW_TAG|NULL}} -; BOTH: DW_AT_name [DW_FORM_strx1] ( indexed (0000000f) string = "glob3") +; BOTH: DW_AT_name [DW_FORM_strx1] (indexed (0000000f) string = "glob3") ; ; Extract the offset of a string to verify that it is referenced in the string ; offsets section. diff --git a/test/DebugInfo/X86/string-offsets-table-order.ll b/test/DebugInfo/X86/string-offsets-table-order.ll index 1378b134659..e39f70c0e30 100644 --- a/test/DebugInfo/X86/string-offsets-table-order.ll +++ b/test/DebugInfo/X86/string-offsets-table-order.ll @@ -13,11 +13,11 @@ ; CHECK: .debug_info contents: ; CHECK: DW_TAG_compile_unit -; CHECK: DW_AT_comp_dir [DW_FORM_strx1] ( indexed (00000000) string = "X3") +; CHECK: DW_AT_comp_dir [DW_FORM_strx1] (indexed (00000000) string = "X3") ; CHECK: DW_TAG_compile_unit -; CHECK: DW_AT_comp_dir [DW_FORM_strx1] ( indexed (00000001) string = "X2") +; CHECK: DW_AT_comp_dir [DW_FORM_strx1] (indexed (00000001) string = "X2") ; CHECK: DW_TAG_compile_unit -; CHECK: DW_AT_comp_dir [DW_FORM_strx1] ( indexed (00000002) string = "X1") +; CHECK: DW_AT_comp_dir [DW_FORM_strx1] (indexed (00000002) string = "X1") ; CHECK: .debug_info.dwo contents: ; CHECK: .debug_str contents: diff --git a/test/DebugInfo/X86/string-offsets-table.ll b/test/DebugInfo/X86/string-offsets-table.ll index ae7797a3055..9960fd833ed 100644 --- a/test/DebugInfo/X86/string-offsets-table.ll +++ b/test/DebugInfo/X86/string-offsets-table.ll @@ -27,11 +27,11 @@ ; MONOLITHIC-NOT: contents: ; MONOLITHIC: DW_TAG_compile_unit ; MONOLITHIC-NOT: {{DW_TAG|NULL}} -; MONOLITHIC: DW_AT_producer [DW_FORM_strx1] ( indexed (00000000) string = "clang{{.*}}") +; MONOLITHIC: DW_AT_producer [DW_FORM_strx1] (indexed (00000000) string = "clang{{.*}}") ; MONOLITHIC-NOT: {{DW_TAG|NULL}} ; MONOLITHIC: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008) ; MONOLITHIC-NOT: {{DW_TAG|NULL}} -; MONOLITHIC: DW_AT_comp_dir [DW_FORM_strx1] ( indexed (00000002) string = "/home/{{.*}}") +; MONOLITHIC: DW_AT_comp_dir [DW_FORM_strx1] (indexed (00000002) string = "/home/{{.*}}") ; Extract the string offsets from the .debug_str section so we can check that ; they are referenced correctly in the .debug_str_offsets section. @@ -59,8 +59,8 @@ ; SPLIT: DW_TAG_compile_unit ; SPLIT-NOT: {{DW_TAG|contents:}} ; SPLIT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008) -; SPLIT: DW_AT_comp_dir [DW_FORM_strx1] ( indexed (00000000) string = "/home/test") -; SPLIT: DW_AT_GNU_dwo_name [DW_FORM_strx1] ( indexed (00000001) string = "foo.dwo") +; SPLIT: DW_AT_comp_dir [DW_FORM_strx1] (indexed (00000000) string = "/home/test") +; SPLIT: DW_AT_GNU_dwo_name [DW_FORM_strx1] (indexed (00000001) string = "foo.dwo") ; Check for the split CU in .debug_info.dwo. ; SPLIT: .debug_info.dwo contents: @@ -73,11 +73,11 @@ ; SPLIT-NOT: contents: ; SPLIT: DW_TAG_enumerator ; SPLIT-NOT: {{DW_TAG|NULL}} -; SPLIT: DW_AT_name [DW_FORM_strx1] ( indexed (00000001) string = "a") +; SPLIT: DW_AT_name [DW_FORM_strx1] (indexed (00000001) string = "a") ; SPLIT-NOT: contents: ; SPLIT: DW_TAG_enumerator ; SPLIT-NOT: {{DW_TAG|NULL}} -; SPLIT: DW_AT_name [DW_FORM_strx1] ( indexed (00000002) string = "b") +; SPLIT: DW_AT_name [DW_FORM_strx1] (indexed (00000002) string = "b") ; ; Extract the string offsets referenced in the main file by the skeleton unit. ; SPLIT: .debug_str contents: -- 2.50.1