[llvm-commits] [llvm] r99031 - /llvm/trunk/lib/MC/MachObjectWriter.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Mar 19 20:58:40 2010
New Revision: 99031

URL: http://llvm.org/viewvc/llvm-project?rev=99031&view=rev
Log:
Better fix for r98994, MachObjectWriterImpl wasn't intended to be virtual.

Modified:
    llvm/trunk/lib/MC/MachObjectWriter.cpp

Modified: llvm/trunk/lib/MC/MachObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MachObjectWriter.cpp?rev=99031&r1=99030&r2=99031&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MachObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/MachObjectWriter.cpp Fri Mar 19 20:58:40 2010
@@ -192,8 +192,6 @@
     : Writer(_Writer), OS(Writer->getStream()), Is64Bit(_Is64Bit) {
   }
 
-  virtual ~MachObjectWriterImpl() {}
-
   void Write8(uint8_t Value) { Writer->Write8(Value); }
   void Write16(uint16_t Value) { Writer->Write16(Value); }
   void Write32(uint32_t Value) { Writer->Write32(Value); }
@@ -685,10 +683,9 @@
     Relocations[Fragment.getParent()].push_back(MRE);
   }
 
-  virtual void RecordRelocation(const MCAssembler &Asm,
-                                const MCDataFragment &Fragment,
-                                const MCAsmFixup &Fixup, MCValue Target,
-                                uint64_t &FixedValue) {
+  void RecordRelocation(const MCAssembler &Asm, const MCDataFragment &Fragment,
+                        const MCAsmFixup &Fixup, MCValue Target,
+                        uint64_t &FixedValue) {
     if (Is64Bit) {
       RecordX86_64Relocation(Asm, Fragment, Fixup, Target, FixedValue);
       return;
@@ -914,7 +911,7 @@
       StringTable += '\x00';
   }
 
-  virtual void ExecutePostLayoutBinding(MCAssembler &Asm) {
+  void ExecutePostLayoutBinding(MCAssembler &Asm) {
     // Create symbol data for any indirect symbols.
     BindIndirectSymbols(Asm);
 
@@ -923,7 +920,7 @@
                        UndefinedSymbolData);
   }
 
-  virtual void WriteObject(const MCAssembler &Asm) {
+  void WriteObject(const MCAssembler &Asm) {
     unsigned NumSections = Asm.size();
 
     // The section data starts after the header, the segment load command (and