diff options
| author | Igor Kudrin <ikudrin@accesssoftek.com> | 2019-08-01 05:23:45 +0000 |
|---|---|---|
| committer | Igor Kudrin <ikudrin@accesssoftek.com> | 2019-08-01 05:23:45 +0000 |
| commit | 510086b5e5cc402fa835d522373f9d9401291d73 (patch) | |
| tree | effef28fead390d2a9fbb4593149e5962ad152d3 | |
| parent | 67a8d6c795ded813c44bfcc54ac419bb51da5dbc (diff) | |
| download | bcm5719-llvm-510086b5e5cc402fa835d522373f9d9401291d73.tar.gz bcm5719-llvm-510086b5e5cc402fa835d522373f9d9401291d73.zip | |
[ELF] Fix finding locations in messages for undefined hidden symbols.
Previously, when `--vs-diagnostics` was used, the linker printed
something like
hidden(undef.s): error: undefined hidden symbol: foo
>>> referenced by undef.s:15
Differential Revision: https://reviews.llvm.org/D65499
llvm-svn: 367515
| -rw-r--r-- | lld/Common/ErrorHandler.cpp | 4 | ||||
| -rw-r--r-- | lld/test/ELF/vs-diagnostics-undefined-hidden.s | 42 |
2 files changed, 43 insertions, 3 deletions
diff --git a/lld/Common/ErrorHandler.cpp b/lld/Common/ErrorHandler.cpp index 983962db579..7e417da8989 100644 --- a/lld/Common/ErrorHandler.cpp +++ b/lld/Common/ErrorHandler.cpp @@ -87,7 +87,7 @@ void lld::checkError(Error e) { static std::string getLocation(std::string msg, std::string defaultMsg) { static std::vector<std::regex> Regexes{ - std::regex(R"(^undefined symbol:.*\n>>> referenced by (\S+):(\d+)\n.*)"), + std::regex(R"(^undefined (?:\S+ )?symbol:.*\n>>> referenced by (\S+):(\d+)\n.*)"), std::regex(R"(^undefined symbol:.*\n>>> referenced by (.*):)"), std::regex( R"(^duplicate symbol: .*\n>>> defined in (\S+)\n>>> defined in.*)"), @@ -95,8 +95,6 @@ static std::string getLocation(std::string msg, std::string defaultMsg) { R"(^duplicate symbol: .*\n>>> defined at (\S+):(\d+).*)"), std::regex( R"(.*\n>>> defined in .*\n>>> referenced by (\S+):(\d+))"), - std::regex( - R"(^undefined (internal|hidden|protected) symbol: .*\n>>> referenced by (\S+):(\d+)\n.*)"), std::regex(R"((\S+):(\d+): unclosed quote)"), }; diff --git a/lld/test/ELF/vs-diagnostics-undefined-hidden.s b/lld/test/ELF/vs-diagnostics-undefined-hidden.s new file mode 100644 index 00000000000..798ca0fc08e --- /dev/null +++ b/lld/test/ELF/vs-diagnostics-undefined-hidden.s @@ -0,0 +1,42 @@ +// 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 + +.file 1 "undef.s" + +.hidden foo +.protected bar +.text +_start: +.loc 1 15 + jmp foo +.loc 1 27 + 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) + .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 |
