[lld] r307767 - [ELF] - Fix handling of weak symbols from static library when using version script.

[George Rimar via llvm-commits]

Author: grimar
Date: Wed Jul 12 04:09:46 2017
New Revision: 307767

URL: http://llvm.org/viewvc/llvm-project?rev=307767&view=rev
Log:
[ELF] - Fix handling of weak symbols from static library when using version script.

When version script was used, binding opf undefined weak symbols sometimes
was calculated as STB_LOCAL, making them non-preemtible what
broke correct relocations handling logic for them.

Fixes PR33738.

Differential revision: https://reviews.llvm.org/D35263

Added:
    lld/trunk/test/ELF/Inputs/version-script-weak.s
    lld/trunk/test/ELF/version-script-weak.s
Modified:
    lld/trunk/ELF/SymbolTable.cpp
    lld/trunk/ELF/Symbols.h

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=307767&r1=307766&r2=307767&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Wed Jul 12 04:09:46 2017
@@ -325,7 +325,7 @@ static int compareDefined(Symbol *S, boo
   if (WasInserted)
     return 1;
   SymbolBody *Body = S->body();
-  if (Body->isLazy() || !Body->isInCurrentDSO())
+  if (!Body->isInCurrentDSO())
     return 1;
   if (Binding == STB_WEAK)
     return -1;

Modified: lld/trunk/ELF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=307767&r1=307766&r2=307767&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.h (original)
+++ lld/trunk/ELF/Symbols.h Wed Jul 12 04:09:46 2017
@@ -65,7 +65,9 @@ public:
     return SymbolKind == LazyArchiveKind || SymbolKind == LazyObjectKind;
   }
   bool isShared() const { return SymbolKind == SharedKind; }
-  bool isInCurrentDSO() const { return !isUndefined() && !isShared(); }
+  bool isInCurrentDSO() const {
+    return !isUndefined() && !isShared() && !isLazy();
+  }
   bool isLocal() const { return IsLocal; }
   bool isPreemptible() const;
   StringRef getName() const { return Name; }

Added: lld/trunk/test/ELF/Inputs/version-script-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/version-script-weak.s?rev=307767&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/version-script-weak.s (added)
+++ lld/trunk/test/ELF/Inputs/version-script-weak.s Wed Jul 12 04:09:46 2017
@@ -0,0 +1,4 @@
+.text
+.globl foo
+.type foo, at function
+foo:

Added: lld/trunk/test/ELF/version-script-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-weak.s?rev=307767&view=auto
==============================================================================
--- lld/trunk/test/ELF/version-script-weak.s (added)
+++ lld/trunk/test/ELF/version-script-weak.s Wed Jul 12 04:09:46 2017
@@ -0,0 +1,28 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/version-script-weak.s -o %tmp.o
+# RUN: rm -f %t.a
+# RUN: llvm-ar rcs %t.a %tmp.o
+# RUN: echo "{ local: *; };" > %t.script
+# RUN: ld.lld -shared --version-script %t.script %t.o %t.a -o %t.so
+# RUN: llvm-readobj -dyn-symbols -r %t.so | FileCheck %s
+
+# CHECK:      Relocations [
+# CHECK-NEXT:   Section ({{.*}}) .rela.plt {
+# CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT foo
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
+# CHECK:      Symbol {
+# CHECK:        Name: foo@
+# CHECK-NEXT:   Value: 0x0
+# CHECK-NEXT:   Size: 0
+# CHECK-NEXT:   Binding: Weak
+# CHECK-NEXT:   Type: None
+# CHECK-NEXT:   Other: 0
+# CHECK-NEXT:   Section: Undefined
+# CHECK-NEXT: }
+
+.text
+ callq foo at PLT
+.weak foo