[PATCH] D65810: [ELF] Fix splitting messages for duplicate symbols.
Igor Kudrin via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 6 23:56:33 PDT 2019
ikudrin updated this revision to Diff 213802.
ikudrin added a comment.
- Removed `Inputs/vs-diagnostics-duplicate-split.s`
- Updated the test accordingly.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D65810/new/
https://reviews.llvm.org/D65810
Files:
Common/ErrorHandler.cpp
test/ELF/vs-diagnostics-duplicate-split.s
Index: test/ELF/vs-diagnostics-duplicate-split.s
===================================================================
--- /dev/null
+++ 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,"", at 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,"", at 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,"", at progbits
Index: Common/ErrorHandler.cpp
===================================================================
--- Common/ErrorHandler.cpp
+++ Common/ErrorHandler.cpp
@@ -184,8 +184,8 @@
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)) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65810.213802.patch
Type: text/x-patch
Size: 2267 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190807/c20565c5/attachment.bin>
More information about the llvm-commits
mailing list