[lld] c1f2fb5 - [DebugInfo] Support both forward and backward slashes in tests
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 23 19:48:43 PDT 2020
Ah, sure - and that is on my list, sorry it's taking a while.
On Wed, Sep 23, 2020 at 7:41 PM Petr Hosek <phosek at google.com> wrote:
>
> I had to revert this change because there were more issues. Relanding this is blocked on https://reviews.llvm.org/D87732.
>
> On Wed, Sep 23, 2020 at 4:18 PM David Blaikie <dblaikie at gmail.com> wrote:
>>
>> Seems there's now a mixed bag of [/\\] and (/|\\) - could you
>> standardize at least this file on one of those two?
>>
>> On Tue, Sep 15, 2020 at 1:00 AM Petr Hosek via llvm-commits
>> <llvm-commits at lists.llvm.org> wrote:
>> >
>> >
>> > Author: Petr Hosek
>> > Date: 2020-09-15T00:59:58-07:00
>> > New Revision: c1f2fb5184ca79e9d53d51355b380c5441191878
>> >
>> > URL: https://github.com/llvm/llvm-project/commit/c1f2fb5184ca79e9d53d51355b380c5441191878
>> > DIFF: https://github.com/llvm/llvm-project/commit/c1f2fb5184ca79e9d53d51355b380c5441191878.diff
>> >
>> > LOG: [DebugInfo] Support both forward and backward slashes in tests
>> >
>> > This addresses test failure revealed by 042c23506869.
>> >
>> > Added:
>> >
>> >
>> > Modified:
>> > lld/test/COFF/duplicate-dwarf.s
>> > lld/test/COFF/undefined-symbol-dwarf.s
>> > lld/test/ELF/conflict-debug-variable2.s
>> > lld/test/wasm/debuginfo.test
>> >
>> > Removed:
>> >
>> >
>> >
>> > ################################################################################
>> > diff --git a/lld/test/COFF/duplicate-dwarf.s b/lld/test/COFF/duplicate-dwarf.s
>> > index b81c13c4300a..d3863e9ca366 100644
>> > --- a/lld/test/COFF/duplicate-dwarf.s
>> > +++ b/lld/test/COFF/duplicate-dwarf.s
>> > @@ -4,21 +4,21 @@
>> > # RUN: not lld-link -lldmingw -out:%t.exe %t.o %t.dupl.o -entry:_Z4funcv 2>&1 | FileCheck %s
>> >
>> > # CHECK: error: duplicate symbol: func()
>> > -# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:6
>> > +# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:6
>> > # CHECK-NEXT: >>> {{.*}}.o
>> > -# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:6
>> > +# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:6
>> > # CHECK-NEXT: >>> {{.*}}.o
>> > # CHECK-EMPTY:
>> > # CHECK-NEXT: error: duplicate symbol: _var
>> > -# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:1
>> > +# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:1
>> > # CHECK-NEXT: >>> {{.*}}.o
>> > -# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:1
>> > +# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:1
>> > # CHECK-NEXT: >>> {{.*}}.o
>> > # CHECK-EMPTY:
>> > # CHECK-NEXT: error: duplicate symbol: A::namespaceVar
>> > -# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:3
>> > +# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:3
>> > # CHECK-NEXT: >>> {{.*}}.o
>> > -# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:3
>> > +# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:3
>> > # CHECK-NEXT: >>> {{.*}}.o
>> >
>> > .text
>> >
>> > diff --git a/lld/test/COFF/undefined-symbol-dwarf.s b/lld/test/COFF/undefined-symbol-dwarf.s
>> > index 7e677f88b7e0..4e890987a1f4 100644
>> > --- a/lld/test/COFF/undefined-symbol-dwarf.s
>> > +++ b/lld/test/COFF/undefined-symbol-dwarf.s
>> > @@ -3,11 +3,11 @@
>> > # RUN: not lld-link /lldmingw /out:%t.exe %t.o /entry:entry 2>&1 | FileCheck %s
>> >
>> > # CHECK: error: undefined symbol: bar()
>> > -# CHECK-NEXT: >>> referenced by /path/to/src{{[/\\]}}undef.cpp:17
>> > +# CHECK-NEXT: >>> referenced by /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}undef.cpp:17
>> > # CHECK-NEXT: >>> {{.*}}.o:(entry)
>> > # CHECK-EMPTY:
>> > # CHECK-NEXT: error: undefined symbol: foo()
>> > -# CHECK-NEXT: >>> referenced by /path/to/src{{[/\\]}}undef.cpp:7
>> > +# CHECK-NEXT: >>> referenced by /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}undef.cpp:7
>> > # CHECK-NEXT: >>> {{.*}}.o:(A::afunc())
>> >
>> > .text
>> >
>> > diff --git a/lld/test/ELF/conflict-debug-variable2.s b/lld/test/ELF/conflict-debug-variable2.s
>> > index 3fb59e6b4d02..fe134f49730d 100644
>> > --- a/lld/test/ELF/conflict-debug-variable2.s
>> > +++ b/lld/test/ELF/conflict-debug-variable2.s
>> > @@ -7,14 +7,14 @@
>> > # INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000027] = "foo")
>> > # INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")
>> > # INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
>> > -# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")
>> > +# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home{{[/\\]}}path{{[/\\]}}test.c")
>> > # INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (1)
>> > # INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)
>> > # INPUT: DW_TAG_variable
>> > # INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000002f] = "bar")
>> > # INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")
>> > # INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
>> > -# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")
>> > +# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home{{[/\\]}}path{{[/\\]}}test.c")
>> > # INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (2)
>> > # INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)
>> >
>> >
>> > diff --git a/lld/test/wasm/debuginfo.test b/lld/test/wasm/debuginfo.test
>> > index 2566b74d93bf..039a051f44fa 100644
>> > --- a/lld/test/wasm/debuginfo.test
>> > +++ b/lld/test/wasm/debuginfo.test
>> > @@ -16,13 +16,13 @@ CHECK-NEXT: DW_AT_low_pc
>> > CHECK-NEXT: DW_AT_high_pc
>> > CHECK-NEXT: DW_AT_frame_base
>> > CHECK-NEXT: DW_AT_name ("test")
>> > -CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
>> > +CHECK-NEXT: DW_AT_decl_file ("/Users{{[/\\]}}yury{{[/\\]}}llvmwasm{{(/|\\)}}hi.c")
>> > CHECK-NEXT: DW_AT_decl_line (3)
>> > CHECK-NEXT: DW_AT_prototyped (true)
>> >
>> > CHECK: DW_TAG_formal_parameter
>> > CHECK-NEXT: DW_AT_name ("t")
>> > -CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
>> > +CHECK-NEXT: DW_AT_decl_file ("/Users{{[/\\]}}yury{{[/\\]}}llvmwasm{{(/|\\)}}hi.c")
>> > CHECK-NEXT: DW_AT_decl_line (3)
>> >
>> > CHECK: DW_TAG_subprogram
>> > @@ -30,7 +30,7 @@ CHECK-NEXT: DW_AT_low_pc
>> > CHECK-NEXT: DW_AT_high_pc
>> > CHECK-NEXT: DW_AT_frame_base
>> > CHECK-NEXT: DW_AT_name ("_start")
>> > -CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
>> > +CHECK-NEXT: DW_AT_decl_file ("/Users{{[/\\]}}yury{{[/\\]}}llvmwasm{{(/|\\)}}hi.c")
>> > CHECK-NEXT: DW_AT_decl_line (7)
>> >
>> > CHECK: DW_TAG_base_type
>> >
>> >
>> >
>> > _______________________________________________
>> > llvm-commits mailing list
>> > llvm-commits at lists.llvm.org
>> > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list