[ELF] Fix splitting messages for duplicate symbols.

[ikudrin]

Summary

D65213 does not work for the case when a source file path includes subdirectories.

[MaskRay]

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

2

Delete Inputs/vs-diagnostics-duplicate-split.s

llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
not ld.lld --vs-diagnostics --shared %t.o %t.o -o /dev/null 2>&1

...
>>>{{.*}}.o:(.text+0x{{.+}})

[ikudrin]

• Removed Inputs/vs-diagnostics-duplicate-split.s
• Updated the test accordingly.

[ruiu]

LGTM

Common/ErrorHandler.cpp

void ErrorHandler::printErrorMsg(const Twine &msg) {
   printHeader("error: ", raw_ostream::RED, msg);
   *errorOS << msg << "\n";
 }
 
 void ErrorHandler::printError(const Twine &msg) {
   if (vsDiagnostics) {
     static std::regex reDuplicateSymbol(
         R"(^(duplicate symbol: .*))"
-        R"((\n>>> defined at \S+:\d+\n>>>.*))"
-        R"((\n>>> defined at \S+:\d+\n>>>.*))");
+        R"((\n>>> defined at \S+:\d+.*\n>>>.*))"
+        R"((\n>>> defined at \S+:\d+.*\n>>>.*))");
     std::string msgStr = msg.str();
     std::smatch match;
     if (std::regex_match(msgStr, match, reDuplicateSymbol)) {
       printErrorMsg(match.str(1) + match.str(2));
       printErrorMsg(match.str(1) + match.str(3));
       return;
     }
   }

test/ELF/Inputs/vs-diagnostics-duplicate-split.s

+.file 1 "/tmp" "duplicate2.s"
+
+.global foo
+
+.text
+.loc 1 20
+foo:
+  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)
+  .byte  0                      # EOM(3)
+
+.section .debug_info,"",@progbits
+  .long .Lend0 - .Lbegin0       # Length of Unit
+.Lbegin0:
+  .short 4                      # DWARF version number
+  .long  .debug_abbrev          # Offset Into Abbrev. Section
+  .byte  8                      # Address Size (in bytes)
+  .byte  1                      # Abbrev [1] 0xb:0x1f DW_TAG_compile_unit
+  .long  .debug_line            # DW_AT_stmt_list
+.Lend0:
+  .section .debug_line,"",@progbits

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

+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t1.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64 %S/Inputs/vs-diagnostics-duplicate-split.s -o %t2.o
+// RUN: not ld.lld --vs-diagnostics --shared %t1.o %t2.o -o /dev/null 2>&1 | FileCheck %s
+
+// CHECK:      duplicate.s(15): error: duplicate symbol: foo
+// CHECK-NEXT: >>> defined at duplicate.s:15 (/tmp/duplicate.s:15)
+// CHECK-NEXT: >>>{{.*}}1.o:(.text+0x{{.+}})
+// CHECK:      duplicate2.s(20): error: duplicate symbol: foo
+// CHECK-NEXT: >>> defined at duplicate2.s:20 (/tmp/duplicate2.s:20)
+// CHECK-NEXT: >>>{{.*}}2.o:(.text+0x{{.+}})
+
+.file 1 "/tmp" "duplicate.s"
+
+.global foo
+.text
+.loc 1 15
+foo:
+  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)
+  .byte  0                      # EOM(3)
+
+.section .debug_info,"",@progbits
+  .long .Lend0 - .Lbegin0       # Length of Unit
+.Lbegin0:
+  .short 4                      # DWARF version number
+  .long  .debug_abbrev          # Offset Into Abbrev. Section
+  .byte  8                      # Address Size (in bytes)
+  .byte  1                      # Abbrev [1] 0xb:0x1f DW_TAG_compile_unit
+  .long  .debug_line            # DW_AT_stmt_list
+.Lend0:
+  .section .debug_line,"",@progbits