diff options
| author | Igor Kudrin <ikudrin@accesssoftek.com> | 2019-08-07 11:32:43 +0000 |
|---|---|---|
| committer | Igor Kudrin <ikudrin@accesssoftek.com> | 2019-08-07 11:32:43 +0000 |
| commit | da41e2107e3f6d954885c5f4e68b7410879c4443 (patch) | |
| tree | 8e8df2ce587a596dbfecd392a16d7f42602a39b8 /lld | |
| parent | 45f721ff059455239bdf54a23ede28ff8db94c14 (diff) | |
| download | llvm-da41e2107e3f6d954885c5f4e68b7410879c4443.zip llvm-da41e2107e3f6d954885c5f4e68b7410879c4443.tar.gz llvm-da41e2107e3f6d954885c5f4e68b7410879c4443.tar.bz2 | |
[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
Diffstat (limited to 'lld')
| -rw-r--r-- | lld/Common/ErrorHandler.cpp | 4 | ||||
| -rw-r--r-- | lld/test/ELF/vs-diagnostics-duplicate-split.s | 39 |
2 files changed, 41 insertions, 2 deletions
diff --git a/lld/Common/ErrorHandler.cpp b/lld/Common/ErrorHandler.cpp index 06c88cd..ce7d253 100644 --- a/lld/Common/ErrorHandler.cpp +++ b/lld/Common/ErrorHandler.cpp @@ -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; diff --git a/lld/test/ELF/vs-diagnostics-duplicate-split.s b/lld/test/ELF/vs-diagnostics-duplicate-split.s new file mode 100644 index 0000000..2342a80 --- /dev/null +++ b/lld/test/ELF/vs-diagnostics-duplicate-split.s @@ -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 |