Revert r250872 in source/Plugins/Disassembler to fix MSVC builds failures.

llvm-svn: 250874

1 files changed, 27 insertions, 16 deletions

diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
index d31e0c3a4ee..22bb13ed03a 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
@@ -7,9 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// C Includes
-// C++ Includes
-// Project includes
+#include "DisassemblerLLVMC.h"
+
 #include "llvm-c/Disassembler.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
@@ -26,8 +25,6 @@
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/ADT/SmallString.h"
 
-// Other libraries and framework includes
-#include "DisassemblerLLVMC.h"
 
 #include "lldb/Core/Address.h"
 #include "lldb/Core/DataExtractor.h"
@@ -61,10 +58,13 @@ public:
     {
     }
 
-    ~InstructionLLVMC() override = default;
+    virtual
+    ~InstructionLLVMC ()
+    {
+    }
 
-    bool
-    DoesBranch() override
+    virtual bool
+    DoesBranch ()
     {
         if (m_does_branch == eLazyBoolCalculate)
         {
@@ -100,8 +100,8 @@ public:
         return m_does_branch == eLazyBoolYes;
     }
 
-    bool
-    HasDelaySlot() override
+    virtual bool
+    HasDelaySlot ()
     {
         if (m_has_delay_slot == eLazyBoolCalculate)
         {
@@ -155,10 +155,10 @@ public:
         return llvm_disasm.m_disasm_ap.get();
     }
 
-    size_t
-    Decode(const lldb_private::Disassembler &disassembler,
-           const lldb_private::DataExtractor &data,
-           lldb::offset_t data_offset) override
+    virtual size_t
+    Decode (const lldb_private::Disassembler &disassembler,
+            const lldb_private::DataExtractor &data,
+            lldb::offset_t data_offset)
     {
         // All we have to do is read the opcode which can be easy for some
         // architectures
@@ -272,8 +272,8 @@ public:
         }
     }
 
-    void
-    CalculateMnemonicOperandsAndComment(const lldb_private::ExecutionContext *exe_ctx) override
+    virtual void
+    CalculateMnemonicOperandsAndComment (const lldb_private::ExecutionContext *exe_ctx)
     {
         DataExtractor data;
         const AddressClass address_class = GetAddressClass ();
@@ -452,6 +452,8 @@ protected:
     bool                    m_using_file_addr;
 };
 
+
+
 DisassemblerLLVMC::LLVMCDisassembler::LLVMCDisassembler (const char *triple, const char *cpu, const char *features_str, unsigned flavor, DisassemblerLLVMC &owner):
     m_is_valid(true)
 {
@@ -519,6 +521,10 @@ DisassemblerLLVMC::LLVMCDisassembler::LLVMCDisassembler (const char *triple, con
         m_is_valid = false;
 }
 
+DisassemblerLLVMC::LLVMCDisassembler::~LLVMCDisassembler()
+{
+}
+
 uint64_t
 DisassemblerLLVMC::LLVMCDisassembler::GetMCInst (const uint8_t *opcode_data,
                                                  size_t opcode_data_len,
@@ -599,6 +605,7 @@ DisassemblerLLVMC::FlavorValidForArchSpec (const lldb_private::ArchSpec &arch, c
         return false;
 }
 
+
 Disassembler *
 DisassemblerLLVMC::CreateInstance (const ArchSpec &arch, const char *flavor)
 {
@@ -775,6 +782,10 @@ DisassemblerLLVMC::DisassemblerLLVMC (const ArchSpec &arch, const char *flavor_s
     }
 }
 
+DisassemblerLLVMC::~DisassemblerLLVMC()
+{
+}
+
 size_t
 DisassemblerLLVMC::DecodeInstructions (const Address &base_addr,
                                        const DataExtractor& data,