[lld] r291573 - Give local binding to VER_NDX_LOCAL symbols.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Tue Jan 10 11:08:13 2017
New Revision: 291573

URL: http://llvm.org/viewvc/llvm-project?rev=291573&view=rev
Log:
Give local binding to VER_NDX_LOCAL symbols.

We were already dropping them from the dynamic symbol table, but the
regular symbol table was still listing them as globals.

Modified:
    lld/trunk/ELF/Symbols.cpp
    lld/trunk/ELF/Symbols.h
    lld/trunk/ELF/SyntheticSections.cpp
    lld/trunk/test/ELF/version-script-anonymous-local.s

Modified: lld/trunk/ELF/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.cpp?rev=291573&r1=291572&r2=291573&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.cpp (original)
+++ lld/trunk/ELF/Symbols.cpp Tue Jan 10 11:08:13 2017
@@ -294,10 +294,22 @@ InputFile *LazyObject::fetch() {
   return createObjectFile(MBRef);
 }
 
-bool Symbol::includeInDynsym() const {
+uint8_t Symbol::computeBinding() const {
+  if (Config->Relocatable)
+    return Binding;
   if (Visibility != STV_DEFAULT && Visibility != STV_PROTECTED)
+    return STB_LOCAL;
+  if (VersionId == VER_NDX_LOCAL && !body()->isUndefined())
+    return STB_LOCAL;
+  if (Config->NoGnuUnique && Binding == STB_GNU_UNIQUE)
+    return STB_GLOBAL;
+  return Binding;
+}
+
+bool Symbol::includeInDynsym() const {
+  if (computeBinding() == STB_LOCAL)
     return false;
-  return (ExportDynamic && VersionId != VER_NDX_LOCAL) || body()->isShared() ||
+  return ExportDynamic || body()->isShared() ||
          (body()->isUndefined() && Config->Shared);
 }
 

Modified: lld/trunk/ELF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=291573&r1=291572&r2=291573&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.h (original)
+++ lld/trunk/ELF/Symbols.h Tue Jan 10 11:08:13 2017
@@ -420,6 +420,7 @@ struct Symbol {
   unsigned InVersionScript : 1;
 
   bool includeInDynsym() const;
+  uint8_t computeBinding() const;
   bool isWeak() const { return Binding == llvm::ELF::STB_WEAK; }
 
   // This field is used to store the Symbol's SymbolBody. This instantiation of

Modified: lld/trunk/ELF/SyntheticSections.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SyntheticSections.cpp?rev=291573&r1=291572&r2=291573&view=diff
==============================================================================
--- lld/trunk/ELF/SyntheticSections.cpp (original)
+++ lld/trunk/ELF/SyntheticSections.cpp Tue Jan 10 11:08:13 2017
@@ -1061,15 +1061,7 @@ static bool sortMipsSymbols(const Symbol
 }
 
 static uint8_t getSymbolBinding(SymbolBody *Body) {
-  Symbol *S = Body->symbol();
-  if (Config->Relocatable)
-    return S->Binding;
-  uint8_t Visibility = S->Visibility;
-  if (Visibility != STV_DEFAULT && Visibility != STV_PROTECTED)
-    return STB_LOCAL;
-  if (Config->NoGnuUnique && S->Binding == STB_GNU_UNIQUE)
-    return STB_GLOBAL;
-  return S->Binding;
+  return Body->symbol()->computeBinding();
 }
 
 template <class ELFT> void SymbolTableSection<ELFT>::finalize() {

Modified: lld/trunk/test/ELF/version-script-anonymous-local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-anonymous-local.s?rev=291573&r1=291572&r2=291573&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-anonymous-local.s (original)
+++ lld/trunk/test/ELF/version-script-anonymous-local.s Tue Jan 10 11:08:13 2017
@@ -3,7 +3,24 @@
 
 # RUN: echo "{ global: foo; local: bar; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj -dyn-symbols -t %t.so | FileCheck %s
+
+# CHECK:      Symbols [
+# CHECK:          Name: bar
+# CHECK-NEXT:     Value:
+# CHECK-NEXT:     Size:
+# CHECK-NEXT:     Binding: Local
+
+# CHECK:          Name: foo
+# CHECK-NEXT:     Value:
+# CHECK-NEXT:     Size:
+# CHECK-NEXT:     Binding: Global
+
+# CHECK:          Name: zed
+# CHECK-NEXT:     Value:
+# CHECK-NEXT:     Size:
+# CHECK-NEXT:     Binding: Global
+
 
 # CHECK:       DynamicSymbols [
 # CHECK-NEXT:    Symbol {