[lld] r194784 - Refactor copy-paste-and-modifed code using callback.

[Rui Ueyama]

Author: ruiu
Date: Thu Nov 14 22:58:54 2013
New Revision: 194784

URL: http://llvm.org/viewvc/llvm-project?rev=194784&view=rev
Log:
Refactor copy-paste-and-modifed code using callback.

Modified:
    lld/trunk/include/lld/Core/Resolver.h
    lld/trunk/lib/Core/Resolver.cpp

Modified: lld/trunk/include/lld/Core/Resolver.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Resolver.h?rev=194784&r1=194783&r2=194784&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Resolver.h (original)
+++ lld/trunk/include/lld/Core/Resolver.h Thu Nov 14 22:58:54 2013
@@ -66,6 +66,7 @@ public:
   std::unique_ptr<MutableFile> resultFile() { return std::move(_result); }
 
 private:
+  typedef std::function<void(StringRef, bool)> UndefCallback;
 
   /// \brief The main function that iterates over the files to resolve
   bool resolveUndefines();
@@ -76,6 +77,7 @@ private:
   void checkDylibSymbolCollisions();
   void linkTimeOptimize();
   void tweakAtoms();
+  void forEachUndefines(UndefCallback callback, bool searchForOverrides);
 
   void markLive(const Atom &atom);
   void addAtoms(const std::vector<const DefinedAtom *>&);

Modified: lld/trunk/lib/Core/Resolver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Resolver.cpp?rev=194784&r1=194783&r2=194784&view=diff
==============================================================================
--- lld/trunk/lib/Core/Resolver.cpp (original)
+++ lld/trunk/lib/Core/Resolver.cpp Thu Nov 14 22:58:54 2013
@@ -95,9 +95,8 @@ void Resolver::handleFile(const File &fi
   _context.setResolverState(resolverState);
 }
 
-void Resolver::handleArchiveFile(const File &file) {
-  const ArchiveLibraryFile *archiveFile = dyn_cast<ArchiveLibraryFile>(&file);
-
+void
+Resolver::forEachUndefines(UndefCallback callback, bool searchForOverrides) {
   // Handle normal archives
   int64_t undefineGenCount = 0;
   do {
@@ -107,12 +106,8 @@ void Resolver::handleArchiveFile(const F
     for (const UndefinedAtom *undefAtom : undefines) {
       StringRef undefName = undefAtom->name();
       // load for previous undefine may also have loaded this undefine
-      if (!_symbolTable.isDefined(undefName)) {
-        if (const File *member = archiveFile->find(undefName, false)) {
-          member->setOrdinal(_context.getNextOrdinalAndIncrement());
-          handleFile(*member);
-        }
-      }
+      if (!_symbolTable.isDefined(undefName))
+        callback(undefName, false);
       // If the undefined symbol has an alternative name, try to resolve the
       // symbol with the name to give it a second chance. This feature is used
       // for COFF "weak external" symbol.
@@ -124,7 +119,7 @@ void Resolver::handleArchiveFile(const F
       }
     }
     // search libraries for overrides of common symbols
-    if (_context.searchArchivesToOverrideTentativeDefinitions()) {
+    if (searchForOverrides) {
       std::vector<StringRef> tentDefNames;
       _symbolTable.tentativeDefinitions(tentDefNames);
       for (StringRef tentDefName : tentDefNames) {
@@ -133,65 +128,39 @@ void Resolver::handleArchiveFile(const F
         const Atom *curAtom = _symbolTable.findByName(tentDefName);
         assert(curAtom != nullptr);
         if (const DefinedAtom *curDefAtom = dyn_cast<DefinedAtom>(curAtom)) {
-          if (curDefAtom->merge() == DefinedAtom::mergeAsTentative) {
-            if (const File *member = archiveFile->find(tentDefName, true)) {
-              member->setOrdinal(_context.getNextOrdinalAndIncrement());
-              handleFile(*member);
-            }
-          }
+          if (curDefAtom->merge() == DefinedAtom::mergeAsTentative)
+            callback(tentDefName, true);
         }
       }
     }
   } while (undefineGenCount != _symbolTable.size());
 }
 
-void Resolver::handleSharedLibrary(const File &file) {
-  const SharedLibraryFile *sharedLibrary = dyn_cast<SharedLibraryFile>(&file);
-  int64_t undefineGenCount = 0;
+void Resolver::handleArchiveFile(const File &file) {
+  const ArchiveLibraryFile *archiveFile = dyn_cast<ArchiveLibraryFile>(&file);
+  auto callback = [&](StringRef undefName, bool dataSymbolOnly) {
+    if (const File *member = archiveFile->find(undefName, dataSymbolOnly)) {
+      member->setOrdinal(_context.getNextOrdinalAndIncrement());
+      handleFile(*member);
+    }
+  };
+  bool searchForOverrides = _context.searchArchivesToOverrideTentativeDefinitions();
+  forEachUndefines(callback, searchForOverrides);
+}
 
+void Resolver::handleSharedLibrary(const File &file) {
   // Add all the atoms from the shared library
+  const SharedLibraryFile *sharedLibrary = dyn_cast<SharedLibraryFile>(&file);
   handleFile(*sharedLibrary);
-  do {
-    undefineGenCount = _symbolTable.size();
-    std::vector<const UndefinedAtom *> undefines;
-    _symbolTable.undefines(undefines);
-    for (const UndefinedAtom *undefAtom : undefines) {
-      StringRef undefName = undefAtom->name();
-      // load for previous undefine may also have loaded this undefine
-      if (!_symbolTable.isDefined(undefName)) {
-        if (const SharedLibraryAtom *shAtom =
-                sharedLibrary->exports(undefName, false))
-          doSharedLibraryAtom(*shAtom);
-      }
-      // If the undefined symbol has an alternative name, try to resolve the
-      // symbol with the name to give it a second chance. This feature is used
-      // for COFF "weak external" symbol.
-      if (!_symbolTable.isDefined(undefName)) {
-        if (const UndefinedAtom *fallbackUndefAtom = undefAtom->fallback()) {
-          _symbolTable.addReplacement(undefAtom, fallbackUndefAtom);
-          _symbolTable.add(*fallbackUndefAtom);
-        }
-      }
-    }
-    // search libraries for overrides of common symbols
-    if (_context.searchSharedLibrariesToOverrideTentativeDefinitions()) {
-      std::vector<StringRef> tentDefNames;
-      _symbolTable.tentativeDefinitions(tentDefNames);
-      for (StringRef tentDefName : tentDefNames) {
-        // Load for previous tentative may also have loaded
-        // something that overrode this tentative, so always check.
-        const Atom *curAtom = _symbolTable.findByName(tentDefName);
-        assert(curAtom != nullptr);
-        if (const DefinedAtom *curDefAtom = dyn_cast<DefinedAtom>(curAtom)) {
-          if (curDefAtom->merge() == DefinedAtom::mergeAsTentative) {
-            if (const SharedLibraryAtom *shAtom =
-                    sharedLibrary->exports(tentDefName, true))
-              doSharedLibraryAtom(*shAtom);
-          }
-        }
-      }
-    }
-  } while (undefineGenCount != _symbolTable.size());
+
+  auto callback = [&](StringRef undefName, bool dataSymbolOnly) {
+    if (const SharedLibraryAtom *shAtom = sharedLibrary->exports(
+            undefName, dataSymbolOnly))
+      doSharedLibraryAtom(*shAtom);
+  };
+  bool searchForOverrides =
+      _context.searchSharedLibrariesToOverrideTentativeDefinitions();
+  forEachUndefines(callback, searchForOverrides);
 }
 
 void Resolver::doUndefinedAtom(const UndefinedAtom& atom) {