1 files changed, 14 insertions, 78 deletions

diff --git a/lib/ReaderWriter/ELF/DynamicFile.h b/lib/ReaderWriter/ELF/DynamicFile.h
index c4e3e7165efd..a155900de781 100644
--- a/lib/ReaderWriter/ELF/DynamicFile.h
+++ b/lib/ReaderWriter/ELF/DynamicFile.h
@@ -12,96 +12,39 @@
 
 #include "Atoms.h"
 #include "lld/Core/SharedLibraryFile.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-#include "llvm/Object/ELF.h"
-#include "llvm/Support/Path.h"
 #include <unordered_map>
 
 namespace lld {
+class ELFLinkingContext;
+
 namespace elf {
+
 template <class ELFT> class DynamicFile : public SharedLibraryFile {
 public:
-  static ErrorOr<std::unique_ptr<DynamicFile>>
-  create(std::unique_ptr<llvm::MemoryBuffer> mb, ELFLinkingContext &ctx);
-
-  const SharedLibraryAtom *exports(StringRef name,
-                                   bool dataSymbolOnly) const override {
-    assert(!dataSymbolOnly && "Invalid option for ELF exports!");
-    // See if we have the symbol.
-    auto sym = _nameToSym.find(name);
-    if (sym == _nameToSym.end())
-      return nullptr;
-    // Have we already created a SharedLibraryAtom for it?
-    if (sym->second._atom)
-      return sym->second._atom;
-    // Create a SharedLibraryAtom for this symbol.
-    return sym->second._atom = new (_alloc) ELFDynamicAtom<ELFT>(
-        *this, name, _soname, sym->second._symbol);
-  }
-
-  StringRef getDSOName() const override { return _soname; }
-
-protected:
-  std::error_code doParse() override {
-    std::error_code ec;
-    _objFile.reset(
-        new llvm::object::ELFFile<ELFT>(_mb->getBuffer(), ec));
-    if (ec)
-      return ec;
-
-    llvm::object::ELFFile<ELFT> &obj = *_objFile;
+  DynamicFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx);
 
-    _soname = obj.getLoadName();
-    if (_soname.empty())
-      _soname = llvm::sys::path::filename(path());
+  static std::error_code isCompatible(MemoryBufferRef mb,
+                                      ELFLinkingContext &ctx);
 
-    // Create a map from names to dynamic symbol table entries.
-    // TODO: This should use the object file's build in hash table instead if
-    // it exists.
-    for (auto i = obj.begin_dynamic_symbols(), e = obj.end_dynamic_symbols();
-         i != e; ++i) {
-      auto name = obj.getSymbolName(i);
-      if ((ec = name.getError()))
-        return ec;
+  const SharedLibraryAtom *exports(StringRef name,
+                                   bool dataSymbolOnly) const override;
 
-      // Dont add local symbols to dynamic entries. The first symbol in the
-      // dynamic symbol table is a local symbol.
-      if (i->getBinding() == llvm::ELF::STB_LOCAL)
-        continue;
+  StringRef getDSOName() const override;
 
-      // TODO: Add absolute symbols
-      if (i->st_shndx == llvm::ELF::SHN_ABS)
-        continue;
+  static bool canParse(file_magic magic);
 
-      if (i->st_shndx == llvm::ELF::SHN_UNDEF) {
-        if (!_useShlibUndefines)
-          continue;
-        // Create an undefined atom.
-        if (!name->empty()) {
-          auto *newAtom = new (_alloc) ELFUndefinedAtom<ELFT>(*this, *name, &*i);
-          _undefinedAtoms._atoms.push_back(newAtom);
-        }
-        continue;
-      }
-      _nameToSym[*name]._symbol = &*i;
-    }
-    return std::error_code();
-  }
+protected:
+  std::error_code doParse() override;
 
 private:
-  DynamicFile(std::unique_ptr<MemoryBuffer> mb, ELFLinkingContext &ctx)
-      : SharedLibraryFile(mb->getBufferIdentifier()), _mb(std::move(mb)),
-        _ctx(ctx), _useShlibUndefines(ctx.useShlibUndefines()) {}
-
   mutable llvm::BumpPtrAllocator _alloc;
   std::unique_ptr<llvm::object::ELFFile<ELFT>> _objFile;
   /// \brief DT_SONAME
   StringRef _soname;
 
   struct SymAtomPair {
-    SymAtomPair() : _symbol(nullptr), _atom(nullptr) {}
-    const typename llvm::object::ELFFile<ELFT>::Elf_Sym *_symbol;
-    const SharedLibraryAtom *_atom;
+    const typename llvm::object::ELFFile<ELFT>::Elf_Sym *_symbol = nullptr;
+    const SharedLibraryAtom *_atom = nullptr;
   };
 
   std::unique_ptr<MemoryBuffer> _mb;
@@ -110,13 +53,6 @@ private:
   mutable std::unordered_map<StringRef, SymAtomPair> _nameToSym;
 };
 
-template <class ELFT>
-ErrorOr<std::unique_ptr<DynamicFile<ELFT>>>
-DynamicFile<ELFT>::create(std::unique_ptr<llvm::MemoryBuffer> mb,
-                          ELFLinkingContext &ctx) {
-  return std::unique_ptr<DynamicFile>(new DynamicFile(std::move(mb), ctx));
-}
-
 } // end namespace elf
 } // end namespace lld