[llvm] r350996 - [llvm-objcopy] [COFF] Remove pointless Reader/Writer base classes. NFC.
Martin Storsjo via llvm-commits
llvm-commits at lists.llvm.org
Sat Jan 12 00:30:09 PST 2019
Author: mstorsjo
Date: Sat Jan 12 00:30:09 2019
New Revision: 350996
URL: http://llvm.org/viewvc/llvm-project?rev=350996&view=rev
Log:
[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
Modified:
llvm/trunk/tools/llvm-objcopy/COFF/Reader.cpp
llvm/trunk/tools/llvm-objcopy/COFF/Reader.h
llvm/trunk/tools/llvm-objcopy/COFF/Writer.cpp
llvm/trunk/tools/llvm-objcopy/COFF/Writer.h
Modified: llvm/trunk/tools/llvm-objcopy/COFF/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/COFF/Reader.cpp?rev=350996&r1=350995&r2=350996&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/COFF/Reader.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/COFF/Reader.cpp Sat Jan 12 00:30:09 2019
@@ -23,8 +23,6 @@ namespace coff {
using namespace object;
-Reader::~Reader() {}
-
Error COFFReader::readExecutableHeaders(Object &Obj) const {
const dos_header *DH = COFFObj.getDOSHeader();
Obj.Is64 = COFFObj.is64();
Modified: llvm/trunk/tools/llvm-objcopy/COFF/Reader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/COFF/Reader.h?rev=350996&r1=350995&r2=350996&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/COFF/Reader.h (original)
+++ llvm/trunk/tools/llvm-objcopy/COFF/Reader.h Sat Jan 12 00:30:09 2019
@@ -23,13 +23,7 @@ struct Object;
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 @@ class COFFReader : public Reader {
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
Modified: llvm/trunk/tools/llvm-objcopy/COFF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/COFF/Writer.cpp?rev=350996&r1=350995&r2=350996&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/COFF/Writer.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/COFF/Writer.cpp Sat Jan 12 00:30:09 2019
@@ -25,8 +25,6 @@ namespace coff {
using namespace object;
using namespace COFF;
-Writer::~Writer() {}
-
Error COFFWriter::finalizeRelocTargets() {
for (Section &Sec : Obj.Sections) {
for (Relocation &R : Sec.Relocs) {
Modified: llvm/trunk/tools/llvm-objcopy/COFF/Writer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/COFF/Writer.h?rev=350996&r1=350995&r2=350996&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/COFF/Writer.h (original)
+++ llvm/trunk/tools/llvm-objcopy/COFF/Writer.h Sat Jan 12 00:30:09 2019
@@ -22,19 +22,10 @@ namespace coff {
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 @@ class COFFWriter : public Writer {
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
More information about the llvm-commits
mailing list