[PATCH] D79114: [lld-macho] Dylib symbols should always replace undefined symbols

[Jez Ng via Phabricator via llvm-commits]

int3 updated this revision to Diff 261164.
int3 added a comment.

extend test, also simplify libresolution.s


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D79114/new/

https://reviews.llvm.org/D79114

Files:
  lld/MachO/SymbolTable.cpp
  lld/test/MachO/Inputs/libresolution.s
  lld/test/MachO/resolution.s


Index: lld/test/MachO/resolution.s
===================================================================
--- /dev/null
+++ lld/test/MachO/resolution.s
@@ -0,0 +1,44 @@
+# REQUIRES: x86
+# RUN: mkdir -p %t
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libresolution.s \
+# RUN:   -o %t/libresolution.o
+# RUN: lld -flavor darwinnew -dylib -install_name \
+# RUN:   @executable_path/libresolution.dylib %t/libresolution.o -o %t/libresolution.dylib
+# RUN: lld -flavor darwinnew -dylib -install_name \
+# RUN:   @executable_path/libresolution2.dylib %t/libresolution.o -o %t/libresolution2.dylib
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/resolution.o
+
+## Check that we select the symbol defined in the first dylib passed on the
+## command line.
+# RUN: lld -flavor darwinnew -o %t/dylib-first -Z -L%t -lresolution -lresolution2 %t/resolution.o
+# RUN: llvm-objdump --macho --bind %t/dylib-first | FileCheck %s --check-prefix=DYLIB-FIRST
+# DYLIB-FIRST:     libresolution _foo
+
+# RUN: lld -flavor darwinnew -o %t/dylib2-first -Z -L%t -lresolution2 -lresolution %t/resolution.o
+# RUN: llvm-objdump --macho --bind %t/dylib2-first | FileCheck %s --check-prefix=DYLIB2-FIRST
+# DYLIB2-FIRST: libresolution2 _foo
+
+## Also check that defined symbols take precedence over dylib symbols.
+# DYLIB-FIRST-NOT: libresolution _bar
+# DYLIB-FIRST-NOT: libresolution _baz
+
+## Check that we pick the dylib symbol over the undefined symbol in the object
+## file, even if the object file appears first on the command line.
+# RUN: lld -flavor darwinnew -o %t/obj-first -Z -L%t %t/resolution.o -lresolution
+# RUN: llvm-objdump --macho --bind %t/obj-first | FileCheck %s --check-prefix=OBJ-FIRST
+# OBJ-FIRST: libresolution _foo
+## But defined symbols should still take precedence.
+# OBJ-FIRST-NOT: libresolution _bar
+# OBJ-FIRST-NOT: libresolution _baz
+
+.globl _main, _bar
+# Global defined symbol
+_bar:
+# Local defined symbol
+_baz:
+
+_main:
+  movq _foo at GOTPCREL(%rip), %rsi
+  movq _bar at GOTPCREL(%rip), %rsi
+  movq _baz at GOTPCREL(%rip), %rsi
+  ret
Index: lld/test/MachO/Inputs/libresolution.s
===================================================================
--- /dev/null
+++ lld/test/MachO/Inputs/libresolution.s
@@ -0,0 +1,7 @@
+.globl _foo, _bar, _baz
+
+_foo:
+
+_bar:
+
+_baz:
Index: lld/MachO/SymbolTable.cpp
===================================================================
--- lld/MachO/SymbolTable.cpp
+++ lld/MachO/SymbolTable.cpp
@@ -64,7 +64,7 @@
   bool wasInserted;
   std::tie(s, wasInserted) = insert(name);
 
-  if (wasInserted)
+  if (wasInserted || isa<Undefined>(s))
     replaceSymbol<DylibSymbol>(s, file, name);
   return s;
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79114.261164.patch
Type: text/x-patch
Size: 2703 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200430/b9a2cb1e/attachment.bin>