Fix crash on invalid.

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

llvm-svn: 320667

diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp
index 12509c9a1757551c5f3715161f543dab955f1877..71ff936f2e4f649a9c2fb0004c25595cbcc13220 100644 (file)
--- a/lld/ELF/SymbolTable.cpp
+++ b/lld/ELF/SymbolTable.cpp
@@ -495,7 +495,11 @@ void SymbolTable::addShared(StringRef Name, SharedFile<ELFT> *File,
   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) {

diff --git a/lld/test/ELF/Inputs/local-symbol-in-dso.so b/lld/test/ELF/Inputs/local-symbol-in-dso.so
new file mode 100755 (executable)
index 0000000..5062a7a
Binary files /dev/null and b/lld/test/ELF/Inputs/local-symbol-in-dso.so differ

diff --git a/lld/test/ELF/invalid-local-symbol-in-dso.s b/lld/test/ELF/invalid-local-symbol-in-dso.s
new file mode 100644 (file)
index 0000000..0a12e46
--- /dev/null
+++ b/lld/test/ELF/invalid-local-symbol-in-dso.s
@@ -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