maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Fix splitting messages for duplicate symbols. 

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

Differential Revision: https://reviews.llvm.org/D65810

llvm-svn: 368153
This commit is contained in:
Igor Kudrin 2019-08-07 11:32:43 +00:00
parent 45f721ff05
commit da41e2107e
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/Common/ErrorHandler.cpp
View File

@ -168,8 +168,8 @@ void ErrorHandler::error(const Twine &msg) {
// this particular error is printed out as two errors.
if (vsDiagnostics) {
static std::regex re(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 str = msg.str();
std::smatch m;

39
lld/test/ELF/vs-diagnostics-duplicate-split.s Normal file
View File

@ -0,0 +1,39 @@
// 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-NEXT: >>> defined at duplicate.s:15 (/tmp/duplicate.s:15)
// CHECK-NEXT: >>>{{.*}}.o:(.text+0x{{.+}})
// CHECK: 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
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