[llvm-objcopy] [COFF] Remove pointless Reader/Writer base classes. NFC.
These were copied as part of the original design from the ELF
backend, but aren't necessary at the moment.
Differential Revision: https://reviews.llvm.org/D56431
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350996 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-objcopy/COFF/Reader.cpp b/tools/llvm-objcopy/COFF/Reader.cpp
index 2d3a594..a017683 100644
--- a/tools/llvm-objcopy/COFF/Reader.cpp
+++ b/tools/llvm-objcopy/COFF/Reader.cpp
@@ -23,8 +23,6 @@
using namespace object;
-Reader::~Reader() {}
-
Error COFFReader::readExecutableHeaders(Object &Obj) const {
const dos_header *DH = COFFObj.getDOSHeader();
Obj.Is64 = COFFObj.is64();
diff --git a/tools/llvm-objcopy/COFF/Reader.h b/tools/llvm-objcopy/COFF/Reader.h
index c972a14..ca7057d 100644
--- a/tools/llvm-objcopy/COFF/Reader.h
+++ b/tools/llvm-objcopy/COFF/Reader.h
@@ -23,13 +23,7 @@
using object::COFFObjectFile;
-class Reader {
-public:
- virtual ~Reader();
- virtual Expected<std::unique_ptr<Object>> create() const = 0;
-};
-
-class COFFReader : public Reader {
+class COFFReader {
const COFFObjectFile &COFFObj;
Error readExecutableHeaders(Object &Obj) const;
@@ -39,7 +33,7 @@
public:
explicit COFFReader(const COFFObjectFile &O) : COFFObj(O) {}
- Expected<std::unique_ptr<Object>> create() const override;
+ Expected<std::unique_ptr<Object>> create() const;
};
} // end namespace coff
diff --git a/tools/llvm-objcopy/COFF/Writer.cpp b/tools/llvm-objcopy/COFF/Writer.cpp
index 213cb11..e32bf68 100644
--- a/tools/llvm-objcopy/COFF/Writer.cpp
+++ b/tools/llvm-objcopy/COFF/Writer.cpp
@@ -25,8 +25,6 @@
using namespace object;
using namespace COFF;
-Writer::~Writer() {}
-
Error COFFWriter::finalizeRelocTargets() {
for (Section &Sec : Obj.Sections) {
for (Relocation &R : Sec.Relocs) {
diff --git a/tools/llvm-objcopy/COFF/Writer.h b/tools/llvm-objcopy/COFF/Writer.h
index a2612ca..ab66e0c 100644
--- a/tools/llvm-objcopy/COFF/Writer.h
+++ b/tools/llvm-objcopy/COFF/Writer.h
@@ -22,19 +22,10 @@
struct Object;
-class Writer {
-protected:
+class COFFWriter {
Object &Obj;
Buffer &Buf;
-public:
- virtual ~Writer();
- virtual Error write() = 0;
-
- Writer(Object &O, Buffer &B) : Obj(O), Buf(B) {}
-};
-
-class COFFWriter : public Writer {
size_t FileSize;
size_t FileAlignment;
size_t SizeOfInitializedData;
@@ -57,10 +48,10 @@
public:
virtual ~COFFWriter() {}
- Error write() override;
+ Error write();
COFFWriter(Object &Obj, Buffer &Buf)
- : Writer(Obj, Buf), StrTabBuilder(StringTableBuilder::WinCOFF) {}
+ : Obj(Obj), Buf(Buf), StrTabBuilder(StringTableBuilder::WinCOFF) {}
};
} // end namespace coff
