[lld] r320434 - Do not read the same .lib file more than once.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Mon Dec 11 15:09:18 2017
New Revision: 320434

URL: http://llvm.org/viewvc/llvm-project?rev=320434&view=rev
Log:
Do not read the same .lib file more than once.

In the following command line,

  lld-link foo/bar.lib /defaultlib:bar.lib

"/defaultlib:bar.lib" should be a nop even if a file with the same
name exists in other library search path.

Fixes https://bugs.llvm.org/show_bug.cgi?id=35476

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

Modified:
    lld/trunk/COFF/Driver.cpp
    lld/trunk/test/COFF/libpath.test

Modified: lld/trunk/COFF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=320434&r1=320433&r2=320434&view=diff
==============================================================================
--- lld/trunk/COFF/Driver.cpp (original)
+++ lld/trunk/COFF/Driver.cpp Mon Dec 11 15:09:18 2017
@@ -315,6 +315,8 @@ Optional<StringRef> LinkerDriver::findFi
   bool Seen = !VisitedFiles.insert(Path.lower()).second;
   if (Seen)
     return None;
+  if (Path.endswith_lower(".lib"))
+    VisitedLibs.insert(sys::path::filename(Path));
   return Path;
 }
 

Modified: lld/trunk/test/COFF/libpath.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/libpath.test?rev=320434&r1=320433&r2=320434&view=diff
==============================================================================
--- lld/trunk/test/COFF/libpath.test (original)
+++ lld/trunk/test/COFF/libpath.test Mon Dec 11 15:09:18 2017
@@ -16,3 +16,11 @@ CHECK1: b{{[/\\]}}std64.lib
 # RUN: FileCheck -check-prefix=CHECK2 %s < %t.log
 
 CHECK2: a{{[/\\]}}std64.lib
+
+# RUN: lld-link /out:%t.exe /entry:main /verbose \
+# RUN:   %t/a/std64.lib /subsystem:console %p/Inputs/hello64.obj \
+# RUN:   /libpath:%t/b /verbose > %t.log 2>&1
+# RUN: FileCheck -check-prefix=CHECK3 %s < %t.log
+
+CHECK3:     Reading {{.*}}a/std64.lib
+CHECK3-NOT: Reading {{.*}}b/std64.lib