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