[lld] r194130 - [PECOFF] Do not expose _noDefaultLibs. No functionality change.

[Rui Ueyama]

Author: ruiu
Date: Tue Nov  5 23:17:00 2013
New Revision: 194130

URL: http://llvm.org/viewvc/llvm-project?rev=194130&view=rev
Log:
[PECOFF] Do not expose _noDefaultLibs. No functionality change.

Modified:
    lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
    lld/trunk/lib/Driver/WinLinkDriver.cpp

Modified: lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h?rev=194130&r1=194129&r2=194130&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h (original)
+++ lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h Tue Nov  5 23:17:00 2013
@@ -189,9 +189,9 @@ public:
   bool addSectionRenaming(raw_ostream &diagnostics,
                           StringRef from, StringRef to);
 
-  void addNoDefaultLib(StringRef libName) { _noDefaultLibs.insert(libName); }
-  const std::set<std::string> &getNoDefaultLibs() const {
-    return _noDefaultLibs;
+  void addNoDefaultLib(StringRef path) { _noDefaultLibs.insert(path); }
+  bool hasNoDefaultLib(StringRef path) const {
+    return _noDefaultLibs.count(path) == 1;
   }
 
   void addDefaultLib(StringRef path) { _defaultLibs.insert(path); }

Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=194130&r1=194129&r2=194130&view=diff
==============================================================================
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Tue Nov  5 23:17:00 2013
@@ -831,8 +831,7 @@ WinLinkDriver::parse(int argc, const cha
   // nor blacklisted by /nodefaultlib.
   if (!ctx.getNoDefaultLibAll()) {
     for (const StringRef path : defaultLibs) {
-      if (ctx.getNoDefaultLibs().find(path) == ctx.getNoDefaultLibs().end() &&
-	  !ctx.hasDefaultLib(path)) {
+      if (!ctx.hasNoDefaultLib(path) && !ctx.hasDefaultLib(path)) {
         inputElements.push_back(std::unique_ptr<InputElement>(
             new PECOFFLibraryNode(ctx, path)));
 	ctx.addDefaultLib(path);