diff options
author | Rui Ueyama <ruiu@google.com> | 2016-03-02 01:23:29 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2016-03-02 01:23:29 +0000 |
commit | 01ba8b2f7b6073fce8c5b92175d5b1ae9e653b4c (patch) | |
tree | e1ce3875167e9bd04c49a46a44b39e31f07eb71a | |
parent | 9cc4b4e0425861ada76052e7f34823a5a810382f (diff) | |
download | bcm5719-llvm-01ba8b2f7b6073fce8c5b92175d5b1ae9e653b4c.tar.gz bcm5719-llvm-01ba8b2f7b6073fce8c5b92175d5b1ae9e653b4c.zip |
Remove more dead code.
llvm-svn: 262443
-rw-r--r-- | lld/include/lld/Core/File.h | 1 | ||||
-rw-r--r-- | lld/include/lld/Core/Resolver.h | 6 | ||||
-rw-r--r-- | lld/include/lld/Core/Simple.h | 60 | ||||
-rw-r--r-- | lld/lib/Core/Resolver.cpp | 1 |
4 files changed, 1 insertions, 67 deletions
diff --git a/lld/include/lld/Core/File.h b/lld/include/lld/Core/File.h index 71c03e0085e..f6e7d7eac10 100644 --- a/lld/include/lld/Core/File.h +++ b/lld/include/lld/Core/File.h @@ -51,7 +51,6 @@ public: kindHeaderObject, ///< a file for file headers kindEntryObject, ///< a file for the entry kindUndefinedSymsObject, ///< a file for undefined symbols - kindAliasSymsObject, ///< a file for alias symbols kindStubHelperObject, ///< a file for stub helpers kindResolverMergedObject, ///< the resolver merged file. kindSectCreateObject, ///< a sect create object file (.o) diff --git a/lld/include/lld/Core/Resolver.h b/lld/include/lld/Core/Resolver.h index cc82c5da7c3..d7b42b6e26e 100644 --- a/lld/include/lld/Core/Resolver.h +++ b/lld/include/lld/Core/Resolver.h @@ -32,9 +32,7 @@ class LinkingContext; /// and producing a merged graph. class Resolver { public: - Resolver(LinkingContext &ctx) - : _ctx(ctx), _symbolTable(), _result(new MergedFile()), - _fileIndex(0) {} + Resolver(LinkingContext &ctx) : _ctx(ctx), _result(new MergedFile()) {} // InputFiles::Handler methods void doDefinedAtom(const DefinedAtom&); @@ -69,7 +67,6 @@ private: void deadStripOptimize(); bool checkUndefines(); void removeCoalescedAwayAtoms(); - void checkDylibSymbolCollisions(); ErrorOr<bool> forEachUndefines(File &file, bool searchForOverrides, UndefCallback callback); @@ -94,7 +91,6 @@ private: // --start-group and --end-group std::vector<File *> _files; std::map<File *, bool> _newUndefinesAdded; - size_t _fileIndex; // List of undefined symbols. std::vector<StringRef> _undefines; diff --git a/lld/include/lld/Core/Simple.h b/lld/include/lld/Core/Simple.h index 2f4fefe06eb..a06eecd9be1 100644 --- a/lld/include/lld/Core/Simple.h +++ b/lld/include/lld/Core/Simple.h @@ -17,7 +17,6 @@ #include "lld/Core/DefinedAtom.h" #include "lld/Core/File.h" -#include "lld/Core/ArchiveLibraryFile.h" #include "lld/Core/LinkingContext.h" #include "lld/Core/Reference.h" #include "lld/Core/UndefinedAtom.h" @@ -81,48 +80,6 @@ private: AtomVector<AbsoluteAtom> _absolute; }; -/// \brief Archive library file that may be used as a virtual container -/// for symbols that should be added dynamically in response to -/// call to find() method. -class SimpleArchiveLibraryFile : public ArchiveLibraryFile { -public: - SimpleArchiveLibraryFile(StringRef filename) - : ArchiveLibraryFile(filename) {} - - const AtomVector<DefinedAtom> &defined() const override { - return _definedAtoms; - } - - const AtomVector<UndefinedAtom> &undefined() const override { - return _undefinedAtoms; - } - - const AtomVector<SharedLibraryAtom> &sharedLibrary() const override { - return _sharedLibraryAtoms; - } - - const AtomVector<AbsoluteAtom> &absolute() const override { - return _absoluteAtoms; - } - - File *find(StringRef sym, bool dataSymbolOnly) override { - // For descendants: - // do some checks here and return dynamically generated files with atoms. - return nullptr; - } - - std::error_code - parseAllMembers(std::vector<std::unique_ptr<File>> &result) override { - return std::error_code(); - } - -private: - AtomVector<DefinedAtom> _definedAtoms; - AtomVector<UndefinedAtom> _undefinedAtoms; - AtomVector<SharedLibraryAtom> _sharedLibraryAtoms; - AtomVector<AbsoluteAtom> _absoluteAtoms; -}; - class SimpleReference : public Reference { public: SimpleReference(Reference::KindNamespace ns, Reference::KindArch arch, @@ -322,23 +279,6 @@ private: StringRef _name; }; -class SimpleAbsoluteAtom : public AbsoluteAtom { -public: - SimpleAbsoluteAtom(const File &f, StringRef name, Scope s, uint64_t value) - : _file(f), _name(name), _scope(s), _value(value) {} - - const File &file() const override { return _file; } - StringRef name() const override { return _name; } - uint64_t value() const override { return _value; } - Scope scope() const override { return _scope; } - -private: - const File &_file; - StringRef _name; - Scope _scope; - uint64_t _value; -}; - } // end namespace lld #endif diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp index 98d2c71023f..b8964358c0e 100644 --- a/lld/lib/Core/Resolver.cpp +++ b/lld/lib/Core/Resolver.cpp @@ -264,7 +264,6 @@ bool Resolver::resolveUndefines() { case File::kindHeaderObject: case File::kindEntryObject: case File::kindUndefinedSymsObject: - case File::kindAliasSymsObject: case File::kindStubHelperObject: case File::kindResolverMergedObject: case File::kindSectCreateObject: { |