Also search BitcodeFiles for exclude-lib symbols

[kongyi]

Summary

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

[pcc]

Test case?

ELF/Driver.cpp

1164–1168 ↗

(On Diff #153824)

Move this code into a lambda and call it from both places.

[ruiu]

ELF/Driver.cpp

1156 ↗

(On Diff #153841)

We don't need to give a long descriptive name for a local variable whose scope is narrow. Also, in LLVM/lld, local variables must be in CamelCase. I'd name this just Visit.

[dexonsmith]

ELF/Driver.cpp

1156 ↗

(On Diff #153841)

Also, in LLVM/lld, local variables must be in CamelCase.

Given that this is a function-like object, I'd argue for lowerCamelCase here.

[ruiu]

Is that part of our coding standard? In lld, all local variables holding
function-like objects are in CamelCase, not in camelCase.

[dexonsmith]

In D48857#1153575, @ruiu wrote:

Is that part of our coding standard? In lld, all local variables holding
function-like objects are in CamelCase, not in camelCase.

Last I checked the coding standard did not call out local variables that are function-like specifically. I've seen them both ways in LLVM, and I prefer aligning them with other functions than with local variables.

If lld is entirely consistent don't let me get in the way.

[ruiu]

It may make sense to get a consensus and update the coding standard
document, as it is not entirely clear. If that's the case, I'd vote for
CamelCase. :)

[dexonsmith]

In D48857#1153613, @ruiu wrote:

It may make sense to get a consensus and update the coding standard
document, as it is not entirely clear. If that's the case, I'd vote for
CamelCase. :)

Way ahead of you :)
http://lists.llvm.org/pipermail/llvm-dev/2018-July/124466.html
https://reviews.llvm.org/D48991

(But let's not hold up this review on that bike-shed...)

[kongyi]

ping...

[ruiu]

LGTM

lld/trunk/ELF/Driver.cpp

 // A special library name "ALL" means all archive files.
 //
 // This is not a popular option, but some programs such as bionic libc use it.
 template <class ELFT>
 static void excludeLibs(opt::InputArgList &Args) {
   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.
 template <class ELFT> static void handleUndefined(StringRef Name) {
   Symbol *Sym = Symtab->find(Name);
   if (!Sym)
     return;
 

lld/trunk/test/ELF/Inputs/exclude-libs.ll

+@fn2 = global void()* null;
+
+target triple = "x86_64-unknown-linux"

lld/trunk/test/ELF/exclude-libs.s

 // REQUIRES: x86
 
 // 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
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs=foo,bar
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo,bar,exc.a
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo:bar:exc.a
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // 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
 // RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared --whole-archive %t.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
 // 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@PLT
+  call fn2@PLT