maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove duplicate code and empty classes. 

llvm-svn: 233316
This commit is contained in:
Rui Ueyama 2015-03-26 21:01:13 +00:00
parent e6d213a84a
commit d97b9d8999
13 changed files with 26 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFFile.h
View File

@ -29,12 +29,6 @@ public:
}
};
template <class ELFT> class AArch64DynamicFile : public DynamicFile<ELFT> {
public:
AArch64DynamicFile(const AArch64LinkingContext &context, StringRef name)
: DynamicFile<ELFT>(context, name) {}
};
} // elf
} // lld

15
lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFReader.h
View File

@ -18,16 +18,6 @@ namespace elf {
typedef llvm::object::ELFType<llvm::support::little, 2, true> AArch64ELFType;
struct AArch64DynamicFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
template <class ELFT>
static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
AArch64LinkingContext &ctx) {
return lld::elf::AArch64DynamicFile<ELFT>::create(std::move(mb), ctx);
}
};
struct AArch64ELFFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::File>> result_type;
@ -48,11 +38,10 @@ public:
};
class AArch64ELFDSOReader
: public ELFDSOReader<AArch64ELFType, AArch64DynamicFileCreateELFTraits,
AArch64LinkingContext> {
: public ELFDSOReader<AArch64ELFType, AArch64LinkingContext> {
public:
AArch64ELFDSOReader(AArch64LinkingContext &ctx)
: ELFDSOReader<AArch64ELFType, AArch64DynamicFileCreateELFTraits,
: ELFDSOReader<AArch64ELFType,
AArch64LinkingContext>(ctx, llvm::ELF::EM_AARCH64) {}
};

6
lld/lib/ReaderWriter/ELF/ARM/ARMELFFile.h
View File

@ -121,12 +121,6 @@ private:
}
};
template <class ELFT> class ARMDynamicFile : public DynamicFile<ELFT> {
public:
ARMDynamicFile(const ARMLinkingContext &context, StringRef name)
: DynamicFile<ELFT>(context, name) {}
};
} // elf
} // lld

16
lld/lib/ReaderWriter/ELF/ARM/ARMELFReader.h
View File

@ -18,16 +18,6 @@ namespace elf {
typedef llvm::object::ELFType<llvm::support::little, 2, false> ARMELFType;
struct ARMDynamicFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
template <class ELFT>
static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
ARMLinkingContext &ctx) {
return lld::elf::ARMDynamicFile<ELFT>::create(std::move(mb), ctx);
}
};
struct ARMELFFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::File>> result_type;
@ -48,12 +38,10 @@ public:
};
class ARMELFDSOReader
: public ELFDSOReader<ARMELFType, ARMDynamicFileCreateELFTraits,
ARMLinkingContext> {
: public ELFDSOReader<ARMELFType, ARMLinkingContext> {
public:
ARMELFDSOReader(ARMLinkingContext &ctx)
: ELFDSOReader<ARMELFType, ARMDynamicFileCreateELFTraits,
ARMLinkingContext>(ctx, llvm::ELF::EM_ARM) {}
: ELFDSOReader<ARMELFType, ARMLinkingContext>(ctx, llvm::ELF::EM_ARM) {}
};
} // namespace elf

18
lld/lib/ReaderWriter/ELF/ELFReader.h
View File

@ -57,7 +57,17 @@ protected:
uint64_t _machine;
};
template <typename ELFT, typename ELFTraitsT, typename ContextT>
struct DynamicFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
template<typename ELFT, typename ContextT>
static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
ContextT &ctx) {
return DynamicFile<ELFT>::create(std::move(mb), ctx);
}
};
template <typename ELFT, typename ContextT>
class ELFDSOReader : public Reader {
public:
typedef llvm::object::Elf_Ehdr_Impl<ELFT> Elf_Ehdr;
@ -76,9 +86,9 @@ public:
std::vector<std::unique_ptr<File>> &result) const override {
std::size_t maxAlignment =
1ULL << llvm::countTrailingZeros(uintptr_t(mb->getBufferStart()));
auto f =
createELF<ELFTraitsT>(llvm::object::getElfArchType(mb->getBuffer()),
maxAlignment, std::move(mb), _ctx);
auto f = createELF<DynamicFileCreateELFTraits>(
llvm::object::getElfArchType(mb->getBuffer()),
maxAlignment, std::move(mb), _ctx);
if (std::error_code ec = f.getError())
return ec;
result.push_back(std::move(*f));

6
lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFFile.h
View File

@ -153,12 +153,6 @@ public:
}
};
template <class ELFT> class HexagonDynamicFile : public DynamicFile<ELFT> {
public:
HexagonDynamicFile(const HexagonLinkingContext &context, StringRef name)
: DynamicFile<ELFT>(context, name) {}
};
} // elf
} // lld

15
lld/lib/ReaderWriter/ELF/Hexagon/HexagonELFReader.h
View File

@ -18,16 +18,6 @@ namespace elf {
typedef llvm::object::ELFType<llvm::support::little, 2, false> HexagonELFType;
struct HexagonDynamicFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
template <class ELFT>
static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
HexagonLinkingContext &ctx) {
return lld::elf::HexagonDynamicFile<ELFT>::create(std::move(mb), ctx);
}
};
struct HexagonELFFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::File>> result_type;
@ -48,11 +38,10 @@ public:
};
class HexagonELFDSOReader
: public ELFDSOReader<HexagonELFType, HexagonDynamicFileCreateELFTraits,
HexagonLinkingContext> {
: public ELFDSOReader<HexagonELFType, HexagonLinkingContext> {
public:
HexagonELFDSOReader(HexagonLinkingContext &ctx)
: ELFDSOReader<HexagonELFType, HexagonDynamicFileCreateELFTraits,
: ELFDSOReader<HexagonELFType,
HexagonLinkingContext>(ctx, llvm::ELF::EM_HEXAGON) {}
};

6
lld/lib/ReaderWriter/ELF/Mips/MipsELFFile.h
View File

@ -323,12 +323,6 @@ private:
}
};
template <class ELFT> class MipsDynamicFile : public DynamicFile<ELFT> {
public:
MipsDynamicFile(const MipsLinkingContext &context, StringRef name)
: DynamicFile<ELFT>(context, name) {}
};
} // elf
} // lld

17
lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h
View File

@ -27,16 +27,6 @@ struct MipsELFFileCreateTraits {
}
};
struct MipsDynamicFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
template <class ELFT>
static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
MipsLinkingContext &ctx) {
return lld::elf::MipsDynamicFile<ELFT>::create(std::move(mb), ctx);
}
};
template <class ELFT>
class MipsELFObjectReader
: public ELFObjectReader<ELFT, MipsELFFileCreateTraits,
@ -63,11 +53,8 @@ private:
};
template <class ELFT>
class MipsELFDSOReader
: public ELFDSOReader<ELFT, MipsDynamicFileCreateELFTraits,
MipsLinkingContext> {
typedef ELFDSOReader<ELFT, MipsDynamicFileCreateELFTraits, MipsLinkingContext>
BaseReaderType;
class MipsELFDSOReader : public ELFDSOReader<ELFT, MipsLinkingContext> {
typedef ELFDSOReader<ELFT, MipsLinkingContext> BaseReaderType;
public:
MipsELFDSOReader(MipsLinkingContext &ctx)

6
lld/lib/ReaderWriter/ELF/X86/X86ELFFile.h
View File

@ -29,12 +29,6 @@ public:
}
};
template <class ELFT> class X86DynamicFile : public DynamicFile<ELFT> {
public:
X86DynamicFile(const X86LinkingContext &context, StringRef name)
: DynamicFile<ELFT>(context, name) {}
};
} // elf
} // lld

15
lld/lib/ReaderWriter/ELF/X86/X86ELFReader.h
View File

@ -18,16 +18,6 @@ namespace elf {
typedef llvm::object::ELFType<llvm::support::little, 2, false> X86ELFType;
struct X86DynamicFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
template <class ELFT>
static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
X86LinkingContext &ctx) {
return lld::elf::X86DynamicFile<ELFT>::create(std::move(mb), ctx);
}
};
struct X86ELFFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::File>> result_type;
@ -48,11 +38,10 @@ public:
};
class X86ELFDSOReader
: public ELFDSOReader<X86ELFType, X86DynamicFileCreateELFTraits,
X86LinkingContext> {
: public ELFDSOReader<X86ELFType, X86LinkingContext> {
public:
X86ELFDSOReader(X86LinkingContext &ctx)
: ELFDSOReader<X86ELFType, X86DynamicFileCreateELFTraits,
: ELFDSOReader<X86ELFType,
X86LinkingContext>(ctx, llvm::ELF::EM_386) {}
};

6
lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFFile.h
View File

@ -29,12 +29,6 @@ public:
}
};
template <class ELFT> class X86_64DynamicFile : public DynamicFile<ELFT> {
public:
X86_64DynamicFile(const X86_64LinkingContext &context, StringRef name)
: DynamicFile<ELFT>(context, name) {}
};
} // elf
} // lld

15
lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFReader.h
View File

@ -18,16 +18,6 @@ namespace elf {
typedef llvm::object::ELFType<llvm::support::little, 2, true> X86_64ELFType;
struct X86_64DynamicFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
template <class ELFT>
static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
X86_64LinkingContext &ctx) {
return lld::elf::X86_64DynamicFile<ELFT>::create(std::move(mb), ctx);
}
};
struct X86_64ELFFileCreateELFTraits {
typedef llvm::ErrorOr<std::unique_ptr<lld::File>> result_type;
@ -48,11 +38,10 @@ public:
};
class X86_64ELFDSOReader
: public ELFDSOReader<X86_64ELFType, X86_64DynamicFileCreateELFTraits,
X86_64LinkingContext> {
: public ELFDSOReader<X86_64ELFType, X86_64LinkingContext> {
public:
X86_64ELFDSOReader(X86_64LinkingContext &ctx)
: ELFDSOReader<X86_64ELFType, X86_64DynamicFileCreateELFTraits,
: ELFDSOReader<X86_64ELFType,
X86_64LinkingContext>(ctx, llvm::ELF::EM_X86_64) {}
};