[lld] r336826 - Also search BitcodeFiles for exclude-lib symbols

[Yi Kong via llvm-commits]

Author: kongyi
Date: Wed Jul 11 10:45:28 2018
New Revision: 336826

URL: http://llvm.org/viewvc/llvm-project?rev=336826&view=rev
Log:
Also search BitcodeFiles for exclude-lib symbols

Archives created with ThinLTO are bitcodes, they also need to be searched for excluded symbols.

Differential Revision: https://reviews.llvm.org/D48857

Added:
    lld/trunk/test/ELF/Inputs/exclude-libs.ll
Modified:
    lld/trunk/ELF/Driver.cpp
    lld/trunk/test/ELF/exclude-libs.s

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=336826&r1=336825&r2=336826&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Wed Jul 11 10:45:28 2018
@@ -1162,12 +1162,19 @@ static void excludeLibs(opt::InputArgLis
   DenseSet<StringRef> Libs = getExcludeLibs(Args);
   bool All = Libs.count("ALL");
 
-  for (InputFile *File : ObjectFiles)
+  auto Visit = [&](InputFile *File) {
     if (!File->ArchiveName.empty())
       if (All || Libs.count(path::filename(File->ArchiveName)))
         for (Symbol *Sym : File->getSymbols())
           if (!Sym->isLocal() && Sym->File == File)
             Sym->VersionId = VER_NDX_LOCAL;
+  };
+
+  for (InputFile *File : ObjectFiles)
+    Visit(File);
+
+  for (BitcodeFile *File : BitcodeFiles)
+    Visit(File);
 }
 
 // Force Sym to be entered in the output. Used for -u or equivalent.

Added: lld/trunk/test/ELF/Inputs/exclude-libs.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/exclude-libs.ll?rev=336826&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/exclude-libs.ll (added)
+++ lld/trunk/test/ELF/Inputs/exclude-libs.ll Wed Jul 11 10:45:28 2018
@@ -0,0 +1,3 @@
+ at fn2 = global void()* null;
+
+target triple = "x86_64-unknown-linux"

Modified: lld/trunk/test/ELF/exclude-libs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/exclude-libs.s?rev=336826&r1=336825&r2=336826&view=diff
==============================================================================
--- lld/trunk/test/ELF/exclude-libs.s (original)
+++ lld/trunk/test/ELF/exclude-libs.s Wed Jul 11 10:45:28 2018
@@ -3,9 +3,10 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 // RUN:   %p/Inputs/exclude-libs.s -o %t2.o
+// RUN: llvm-as --data-layout=elf %p/Inputs/exclude-libs.ll -o %t3.o
 // RUN: mkdir -p %t.dir
 // RUN: rm -f %t.dir/exc.a
-// RUN: llvm-ar rcs %t.dir/exc.a %t2.o
+// RUN: llvm-ar rcs %t.dir/exc.a %t2.o %t3.o
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
@@ -22,7 +23,7 @@
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
-// RUN: ld.lld -shared %t.o %t2.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
+// RUN: ld.lld -shared %t.o %t2.o %t3.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared --whole-archive %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo,bar,exc.a
@@ -32,10 +33,13 @@
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // DEFAULT: Name: fn
+// DEFAULT: Name: fn2
 // DEFAULT: Name: foo
 // EXCLUDE-NOT: Name: fn
+// EXCLUDE-NOT: Name: fn2
 // EXCLUDE: Name: foo
 
-.globl fn, foo
+.globl fn, fn2, foo
 foo:
   call fn at PLT
+  call fn2 at PLT