[PATCH] D41257: Use warn() instead of error() to report a bad symbol in a DSO.

[Rui Ueyama via Phabricator via llvm-commits]

ruiu updated this revision to Diff 127036.
ruiu added a comment.

- Instead of adding a bad symbol to the symbol table, skip it.


https://reviews.llvm.org/D41257

Files:
  lld/ELF/InputFiles.cpp
  lld/ELF/SymbolTable.cpp
  lld/test/ELF/invalid-local-symbol-in-dso.s


Index: lld/test/ELF/invalid-local-symbol-in-dso.s
===================================================================
--- lld/test/ELF/invalid-local-symbol-in-dso.s
+++ lld/test/ELF/invalid-local-symbol-in-dso.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc %s -o %t.o -filetype=obj -triple x86_64-pc-linux
 
 # We used to crash on this
-# RUN: not ld.lld %t.o %p/Inputs/local-symbol-in-dso.so -o %t 2>&1 | FileCheck %s
+# RUN: ld.lld %t.o %p/Inputs/local-symbol-in-dso.so -o %t 2>&1 | FileCheck %s
 # CHECK: Found local symbol 'foo' in global part of symbol table in file {{.*}}local-symbol-in-dso.so
Index: lld/ELF/SymbolTable.cpp
===================================================================
--- lld/ELF/SymbolTable.cpp
+++ lld/ELF/SymbolTable.cpp
@@ -495,11 +495,7 @@
   if (WasInserted || ((S->isUndefined() || S->isLazy()) &&
                       S->getVisibility() == STV_DEFAULT)) {
     uint8_t Binding = S->Binding;
-    uint8_t OrigBinding = Sym.getBinding();
-    if (OrigBinding == STB_LOCAL)
-      error("Found local symbol '" + Name +
-            "' in global part of symbol table in file " + toString(File));
-    replaceSymbol<SharedSymbol>(S, File, Name, OrigBinding, Sym.st_other,
+    replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other,
                                 Sym.getType(), Sym.st_value, Sym.st_size,
                                 Alignment, VerdefIndex);
     if (!WasInserted) {
Index: lld/ELF/InputFiles.cpp
===================================================================
--- lld/ELF/InputFiles.cpp
+++ lld/ELF/InputFiles.cpp
@@ -807,6 +807,12 @@
       continue;
     }
 
+    if (Sym.getBinding() == STB_LOCAL) {
+      warn("Found local symbol '" + Name +
+           "' in global part of symbol table in file " + toString(this));
+      continue;
+    }
+
     // Ignore local symbols.
     if (Versym && VersymIndex == VER_NDX_LOCAL)
       continue;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41257.127036.patch
Type: text/x-patch
Size: 1916 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171214/7fda88ce/attachment.bin>