[PECOFF] Do not check if library is already added.

llvm-svn: 195289

3 files changed, 5 insertions, 18 deletions

diff --git a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
index 754c903defe..eaab5b637eb 100644
--- a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
@@ -203,11 +203,6 @@ public:
     return _noDefaultLibs.count(path) == 1;
   }
 
-  void addDefaultLib(StringRef path) { _defaultLibs.insert(path); }
-  bool hasDefaultLib(StringRef path) const {
-    return _defaultLibs.count(path) == 1;
-  }
-
   void setNoDefaultLibAll(bool val) { _noDefaultLibAll = val; }
   bool getNoDefaultLibAll() const { return _noDefaultLibAll; }
 
@@ -300,11 +295,6 @@ private:
   // The set to store /nodefaultlib arguments.
   std::set<std::string> _noDefaultLibs;
 
-  // A set containing all the library files specified by /defaultlib. This is to
-  // keep track what files are already added to the input graph, in order to
-  // prevent adding the same file more than once to the input graph.
-  std::set<std::string> _defaultLibs;
-
   std::vector<StringRef> _inputSearchPaths;
   std::unique_ptr<Reader> _reader;
   std::unique_ptr<Writer> _writer;
diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp
index 5ca0fa5925a..7f71a3c97b9 100644
--- a/lld/lib/Driver/WinLinkDriver.cpp
+++ b/lld/lib/Driver/WinLinkDriver.cpp
@@ -910,15 +910,11 @@ WinLinkDriver::parse(int argc, const char *argv[], PECOFFLinkingContext &ctx,
 
   // Add the libraries specified by /defaultlib unless they are already added
   // nor blacklisted by /nodefaultlib.
-  if (!ctx.getNoDefaultLibAll()) {
-    for (const StringRef path : defaultLibs) {
-      if (!ctx.hasNoDefaultLib(path) && !ctx.hasDefaultLib(path)) {
+  if (!ctx.getNoDefaultLibAll())
+    for (const StringRef path : defaultLibs)
+      if (!ctx.hasNoDefaultLib(path))
         inputElements.push_back(std::unique_ptr<InputElement>(
             new PECOFFLibraryNode(ctx, path)));
-	ctx.addDefaultLib(path);
-      }
-    }
-  }
 
   if (inputElements.empty() && !isReadingDirectiveSection) {
     diagnostics << "No input files\n";
diff --git a/lld/unittests/DriverTests/WinLinkDriverTest.cpp b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
index f807be9655a..65f2a9c3161 100644
--- a/lld/unittests/DriverTests/WinLinkDriverTest.cpp
+++ b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
@@ -294,9 +294,10 @@ TEST_F(WinLinkParserTest, DefaultLib) {
 TEST_F(WinLinkParserTest, DefaultLibDuplicates) {
   EXPECT_TRUE(parse("link.exe", "/defaultlib:user32.lib",
                     "/defaultlib:user32.lib", "a.obj", nullptr));
-  EXPECT_EQ(2, inputFileCount());
+  EXPECT_EQ(3, inputFileCount());
   EXPECT_EQ("a.obj", inputFile(0));
   EXPECT_EQ("user32.lib", inputFile(1));
+  EXPECT_EQ("user32.lib", inputFile(2));
 }
 
 TEST_F(WinLinkParserTest, NoDefaultLib) {