[ELF] For VS-style diagnostics, prefer using the full path.

[ikudrin]

Summary

The file path we print in the message header is then used by Visual Studio to fill Error List so that a user can click on an item and jump to the mentioned location. If we use only a name part for that, Visual Studio might be unable to find the file or, even worse, show a wrong one.

[ruiu]

Generally looking good, but do these tests pass on Windows on which a path separator is \? It seems like you hardcoded / as a path separator in the tests.

[ikudrin]

We had that issue with D65810 (rL368153), Windows build bots complained about different path separators. That was fixed in rL368169. Thus, I made similar adjustments in this patch.

[ikudrin]

Well, I have checked the patch on Windows. All tests pass.

[ruiu]

LGTM

I confirmed that these tests are not affected by the actual path on a machine running the tests. I missed the part that you added .line directive in this patch. Thank you for doing this.

lld/trunk/Common/ErrorHandler.cpp

 // This function returns an error location string. An error location is
 // extracted from an error message using regexps.
 std::string ErrorHandler::getLocation(const Twine &msg) {
   if (!vsDiagnostics)
     return logName;
 
   static std::regex regexes[] = {
       std::regex(
-          R"(^undefined (?:\S+ )?symbol:.*\n>>> referenced by (\S+):(\d+)\n.*)"),
+          R"(^undefined (?:\S+ )?symbol:.*\n)"
+          R"(>>> referenced by .+\((\S+):(\d+)\))"),
+      std::regex(
+          R"(^undefined (?:\S+ )?symbol:.*\n>>> referenced by (\S+):(\d+))"),
       std::regex(R"(^undefined symbol:.*\n>>> referenced by (.*):)"),
       std::regex(
           R"(^duplicate symbol: .*\n>>> defined in (\S+)\n>>> defined in.*)"),
-      std::regex(R"(^duplicate symbol: .*\n>>> defined at (\S+):(\d+).*)"),
+      std::regex(
+          R"(^duplicate symbol: .*\n>>> defined at .+\((\S+):(\d+)\))"),
+      std::regex(R"(^duplicate symbol: .*\n>>> defined at (\S+):(\d+))"),
+      std::regex(
+          R"(.*\n>>> defined in .*\n>>> referenced by .+\((\S+):(\d+)\))"),
       std::regex(R"(.*\n>>> defined in .*\n>>> referenced by (\S+):(\d+))"),
       std::regex(R"((\S+):(\d+): unclosed quote)"),
   };
 
   std::string str = msg.str();
   for (std::regex &re : regexes) {
     std::smatch m;
     if (!std::regex_search(str, m, re))

lld/trunk/test/ELF/Inputs/vs-diagnostics-duplicate3.s

 .file "duplicate3.s"
 
-.global baz
+.global baz, qux
 .text
 baz:
   nop
+qux:
+  nop

lld/trunk/test/ELF/vs-diagnostics-duplicate-split.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
 // RUN: not ld.lld --vs-diagnostics --shared %t.o %t.o -o /dev/null 2>&1 | FileCheck %s
 
-// CHECK:      duplicate.s(15): error: duplicate symbol: foo
+// CHECK:      /tmp{{/|\\}}duplicate.s(15): error: duplicate symbol: foo
 // CHECK-NEXT: >>> defined at duplicate.s:15 (/tmp{{/|\\}}duplicate.s:15)
 // CHECK-NEXT: >>>{{.*}}.o:(.text+0x{{.+}})
-// CHECK:      duplicate.s(15): error: duplicate symbol: foo
+// CHECK:      /tmp{{/|\\}}duplicate.s(15): error: duplicate symbol: foo
 // CHECK-NEXT: >>> defined at duplicate.s:15 (/tmp{{/|\\}}duplicate.s:15)
 // CHECK-NEXT: >>>{{.*}}.o:(.text+0x{{.+}})
 
 .file 1 "/tmp" "duplicate.s"
 
 .global foo
 .text
 .loc 1 15

lld/trunk/test/ELF/vs-diagnostics-duplicate.s

 
 // Case 3. For the second definition of `baz` we know only the source file found in a STT_FILE symbol.
 // CHECK:      duplicate.s(30): error: duplicate symbol: baz
 // CHECK-NEXT: >>> defined at duplicate.s:30
 // CHECK-NEXT: >>> {{.*}}1.o:(.text+0x{{.+}})
 // CHECK-NEXT: >>> defined at duplicate3.s
 // CHECK-NEXT: >>>            {{.*}}3.o:(.text+0x{{.+}})
 
-.global _start, foo, bar, baz
+// Check that we prefer using the full path of a source file.
+// CHECK:      /tmp{{/|\\}}duplicate.s(33): error: duplicate symbol: qux
+// CHECK-NEXT: >>> defined at duplicate.s:33 (/tmp{{/|\\}}duplicate.s:33)
+// CHECK-NEXT: >>> {{.*}}1.o:(.text+0x{{.+}})
+// CHECK-NEXT: >>> defined at duplicate3.s
+// CHECK-NEXT: >>>            {{.*}}3.o:(.text+0x{{.+}})
+
+.global _start, foo, bar, baz, qux
 .text
 _start:
   nop
 
 foo:
   nop
 
 .file 1 "duplicate.s"
 .loc 1 15
 
 bar:
   nop
 
 .loc 1 30
 baz:
   nop
 
+.file 2 "/tmp" "duplicate.s"
+.loc 2 33
+qux:
+  nop
+
 .section .debug_abbrev,"",@progbits
   .byte  1                      # Abbreviation Code
   .byte 17                      # DW_TAG_compile_unit
   .byte  0                      # DW_CHILDREN_no
   .byte 16                      # DW_AT_stmt_list
   .byte 23                      # DW_FORM_sec_offset
   .byte  0                      # EOM(1)
   .byte  0                      # EOM(2)

lld/trunk/test/ELF/vs-diagnostics-dynamic-relocation.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: not ld.lld -shared --vs-diagnostics %t.o -o /dev/null 2>&1 | FileCheck %s
 
 // CHECK: dyn.s(15): error: can't create dynamic relocation R_X86_64_64 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output
 // CHECK-NEXT: >>> defined in {{.*}}.o
 // CHECK-NEXT: >>> referenced by dyn.s:15
 // CHECK-NEXT: >>>{{.*}}.o:(.text+0x{{.+}})
 
+// CHECK: /tmp{{/|\\}}dyn.s(20): error: can't create dynamic relocation {{.*}}
+// CHECK-NEXT: >>> defined in {{.*}}.o
+// CHECK-NEXT: >>> referenced by dyn.s:20 (/tmp{{/|\\}}dyn.s:20)
+// CHECK-NEXT: >>>{{.*}}.o:(.text+0x{{.+}})
+
 .file 1 "dyn.s"
 .loc 1 15
 
 foo:
 .quad foo
 
+.file 2 "/tmp" "dyn.s"
+.loc 2 20
+
+bar:
+.quad bar
+
 .section .debug_abbrev,"",@progbits
   .byte  1                      # Abbreviation Code
   .byte 17                      # DW_TAG_compile_unit
   .byte  0                      # DW_CHILDREN_no
   .byte 16                      # DW_AT_stmt_list
   .byte 23                      # DW_FORM_sec_offset
   .byte  0                      # EOM(1)
   .byte  0                      # EOM(2)

lld/trunk/test/ELF/vs-diagnostics-undefined-hidden.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
 // RUN: not ld.lld --vs-diagnostics -shared %t.o -o /dev/null 2>&1 \
 // RUN:   | FileCheck %s
 
 // CHECK:      undef.s(15): error: undefined hidden symbol: foo
 // CHECK-NEXT: >>> referenced by undef.s:15
 
 // CHECK:      undef.s(27): error: undefined protected symbol: bar
 // CHECK-NEXT: >>> referenced by undef.s:27
 
+// CHECK:      /tmp{{/|\\}}undef.s(13): error: undefined protected symbol: baz
+// CHECK-NEXT: >>> referenced by undef.s:13 (/tmp{{/|\\}}undef.s:13)
+
 .file 1 "undef.s"
+.file 2 "/tmp" "undef.s"
 
 .hidden foo
-.protected bar
+.protected bar, baz
 .text
 _start:
 .loc 1 15
   jmp foo
 .loc 1 27
   jmp bar
+.loc 2 13
+  jmp baz
 
 .section .debug_abbrev,"",@progbits
   .byte  1                      # Abbreviation Code
   .byte 17                      # DW_TAG_compile_unit
   .byte  0                      # DW_CHILDREN_no
   .byte 16                      # DW_AT_stmt_list
   .byte 23                      # DW_FORM_sec_offset
   .byte  0                      # EOM(1)

lld/trunk/test/ELF/vs-diagnostics-undefined-symbol-3.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
 // RUN: not ld.lld --vs-diagnostics %t1.o -o %tout 2>&1 \
 // RUN:   | FileCheck -check-prefix=ERR -check-prefix=CHECK %s
 // RUN: ld.lld --vs-diagnostics --warn-unresolved-symbols %t1.o -o %tout 2>&1 \
 // RUN:   | FileCheck -check-prefix=WARN -check-prefix=CHECK %s
 
 // ERR:        undef3.s(15): error: undefined symbol: foo
 // WARN:       undef3.s(15): warning: undefined symbol: foo
 // CHECK:      >>> referenced by undef3.s:15
 // CHECK-NEXT: >>> {{.*}}1.o:(.text+0x{{.+}})
 
+// ERR:        /tmp{{/|\\}}undef3.s(20): error: undefined symbol: bar
+// WARN:       /tmp{{/|\\}}undef3.s(20): warning: undefined symbol: bar
+// CHECK:      >>> referenced by undef3.s:20 (/tmp{{/|\\}}undef3.s:20)
+// CHECK-NEXT: >>> {{.*}}1.o:(.text+0x{{.+}})
+
 .file 1 "undef3.s"
+.file 2 "/tmp" "undef3.s"
 
-.global _start, foo
+.global _start, foo, bar
 .text
 _start:
 .loc 1 15
   jmp foo
+.loc 2 20
+  jmp bar
 
 .section .debug_abbrev,"",@progbits
   .byte  1                      # Abbreviation Code
   .byte 17                      # DW_TAG_compile_unit
   .byte  0                      # DW_CHILDREN_no
   .byte 16                      # DW_AT_stmt_list
   .byte 23                      # DW_FORM_sec_offset
   .byte  0                      # EOM(1)