[lld] r320667 - Fix crash on invalid.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Wed Dec 13 21:01:49 2017
New Revision: 320667

URL: http://llvm.org/viewvc/llvm-project?rev=320667&view=rev
Log:
Fix crash on invalid.

We would fail an assert if a shared library had a local symbol after
sh_info.

Added:
    lld/trunk/test/ELF/Inputs/local-symbol-in-dso.so   (with props)
    lld/trunk/test/ELF/invalid-local-symbol-in-dso.s
Modified:
    lld/trunk/ELF/SymbolTable.cpp

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=320667&r1=320666&r2=320667&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Wed Dec 13 21:01:49 2017
@@ -495,7 +495,11 @@ void SymbolTable::addShared(StringRef Na
   if (WasInserted || ((S->isUndefined() || S->isLazy()) &&
                       S->getVisibility() == STV_DEFAULT)) {
     uint8_t Binding = S->Binding;
-    replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other,
+    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,
                                 Sym.getType(), Sym.st_value, Sym.st_size,
                                 Alignment, VerdefIndex);
     if (!WasInserted) {

Added: lld/trunk/test/ELF/Inputs/local-symbol-in-dso.so
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/local-symbol-in-dso.so?rev=320667&view=auto
==============================================================================
Binary files lld/trunk/test/ELF/Inputs/local-symbol-in-dso.so (added) and lld/trunk/test/ELF/Inputs/local-symbol-in-dso.so Wed Dec 13 21:01:49 2017 differ

Propchange: lld/trunk/test/ELF/Inputs/local-symbol-in-dso.so
------------------------------------------------------------------------------
    svn:executable = *

Added: lld/trunk/test/ELF/invalid-local-symbol-in-dso.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid-local-symbol-in-dso.s?rev=320667&view=auto
==============================================================================
--- lld/trunk/test/ELF/invalid-local-symbol-in-dso.s (added)
+++ lld/trunk/test/ELF/invalid-local-symbol-in-dso.s Wed Dec 13 21:01:49 2017
@@ -0,0 +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
+# CHECK: Found local symbol 'foo' in global part of symbol table in file {{.*}}local-symbol-in-dso.so