[PATCH] D65499: [ELF] Fix finding the location in messages for undefined hidden symbols.

[Igor Kudrin via Phabricator via llvm-commits]

ikudrin updated this revision to Diff 212537.
ikudrin added a project: lld.
ikudrin added a comment.

- Combined all the suggestions to improve the regular expression.
- Addressed @MaskRay's comments for the test.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65499/new/

https://reviews.llvm.org/D65499

Files:
  Common/ErrorHandler.cpp
  test/ELF/vs-diagnostics-undefined-hidden.s


Index: test/ELF/vs-diagnostics-undefined-hidden.s
===================================================================
--- /dev/null
+++ 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,"", 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
@@ -87,7 +87,7 @@
 
 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 @@
           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)"),
   };
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65499.212537.patch
Type: text/x-patch
Size: 2577 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190731/a918a838/attachment.bin>