[PATCH] D94280: [ELF] --exclude-libs: localize defined libcall symbols referenced by lto.tmp

[Fangrui Song via Phabricator via llvm-commits]

MaskRay created this revision.
MaskRay added reviewers: grimar, psmith, rprichard.
Herald added subscribers: steven_wu, hiraditya, arichardson, inglorion, emaste.
Herald added a reviewer: espindola.
MaskRay requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Fixes PR48681: after LTO, lto.tmp may reference a libcall symbol not in an IR
symbol table of any bitcode file. If such a symbol is defined in an archive
matched by a --exclude-libs, we don't correctly localize the symbol.

Add another `excludeLibs` after `compileBitcodeFiles` to localize such libcall
symbols. Unfortunately we have keep the existing one for D43126 <https://reviews.llvm.org/D43126>.

As I understand it, using VER_NDX_LOCAL is an implementation detail of
`--exclude-libs` and the `symbol ... has undefined version ...` error should not
be exempted. Ideally we should error as GNU ld does.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D94280

Files:
  lld/ELF/Driver.cpp
  lld/test/ELF/lto/exclude-libs-libcall.ll


Index: lld/test/ELF/lto/exclude-libs-libcall.ll
===================================================================
--- /dev/null
+++ lld/test/ELF/lto/exclude-libs-libcall.ll
@@ -0,0 +1,27 @@
+; RUN: rm -rf %t && split-file %s %t
+; RUN: llvm-as %t/a.ll -o %t/a.bc
+; RUN: llvm-mc -filetype=obj -triple=x86_64 %t/b.s -o %t/b.o
+; RUN: llvm-ar rc %t/b.a %t/b.o
+; RUN: ld.lld -shared --exclude-libs=b.a %t/a.bc %t/b.a -o %t.so -y __divti3 2>&1 | FileCheck %s --check-prefix=TRACE
+; RUN: llvm-readelf --dyn-syms %t.so | FileCheck %s
+
+; TRACE:      {{.*}}/b.a: lazy definition of __divti3
+; TRACE-NEXT: lto.tmp: reference to __divti3
+; TRACE-NEXT: {{.*}}/b.a(b.o): definition of __divti3
+
+; CHECK:     Symbol table '.dynsym' contains 2 entries:
+; CHECK-NOT: __divti3
+
+;--- a.ll
+target triple = "x86_64-unknown-linux"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+
+define i128 @foo(i128 %x, i128 %y) {
+entry:
+  %div = sdiv i128 %x, %y
+  ret i128 %div
+}
+
+;--- b.s
+.globl __divti3
+__divti3:
Index: lld/ELF/Driver.cpp
===================================================================
--- lld/ELF/Driver.cpp
+++ lld/ELF/Driver.cpp
@@ -2146,7 +2146,11 @@
   // They also might be exported if referenced by DSOs.
   script->declareSymbols();
 
-  // Handle the -exclude-libs option.
+  // Handle --exclude-libs. This is before scanVersionScript() due to a
+  // workaround for Android ndk: for a defined versioned symbol in an archive
+  // without a version node in the version script, Android does not expect a
+  // 'has undefined version' error in -shared --exclude-libs=ALL mode (PR36295).
+  // GNU ld errors in this case.
   if (args.hasArg(OPT_exclude_libs))
     excludeLibs(args);
 
@@ -2179,6 +2183,11 @@
   // except a few linker-synthesized ones will be added to the symbol table.
   compileBitcodeFiles<ELFT>();
 
+  // Handle --exclude-libs again because lto.tmp may reference additional
+  // libcalls symbols defined in an excluded archive.
+  if (args.hasArg(OPT_exclude_libs))
+    excludeLibs(args);
+
   // Symbol resolution finished. Report backward reference problems.
   reportBackrefs();
   if (errorCount())


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D94280.315284.patch
Type: text/x-patch
Size: 2195 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210108/d4df07f4/attachment.bin>