Fix Clang-tidy modernize-use-override warnings in source/Plugins/ObjectContainer and ObjectFile; other minor fixes.

llvm-svn: 251119

1 files changed, 71 insertions, 95 deletions

diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index 8ccca3943fd..48d37bf32a0 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -7,8 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
 #include "llvm/ADT/StringRef.h" 
 
+// Project includes
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/DataBuffer.h"
 #include "lldb/Core/Debugger.h"
@@ -67,8 +71,8 @@ public:
         SetRegisterDataFrom_LC_THREAD (data);
     }
 
-    virtual void
-    InvalidateAllRegisters ()
+    void
+    InvalidateAllRegisters() override
     {
         // Do nothing... registers are always valid...
     }
@@ -127,7 +131,6 @@ public:
             }
         }
     }
-    
 
     static size_t
     WriteRegister (RegisterContext *reg_ctx, const char *name, const char *alt_name, size_t reg_byte_size, Stream &data)
@@ -250,44 +253,43 @@ public:
     }
 
 protected:
-    virtual int
-    DoReadGPR (lldb::tid_t tid, int flavor, GPR &gpr)
+    int
+    DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override
     {
         return 0;
     }
 
-    virtual int
-    DoReadFPU (lldb::tid_t tid, int flavor, FPU &fpu)
+    int
+    DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override
     {
         return 0;
     }
 
-    virtual int
-    DoReadEXC (lldb::tid_t tid, int flavor, EXC &exc)
+    int
+    DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteGPR (lldb::tid_t tid, int flavor, const GPR &gpr)
+    int
+    DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteFPU (lldb::tid_t tid, int flavor, const FPU &fpu)
+    int
+    DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteEXC (lldb::tid_t tid, int flavor, const EXC &exc)
+    int
+    DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override
     {
         return 0;
     }
 };
 
-
 class RegisterContextDarwin_i386_Mach : public RegisterContextDarwin_i386
 {
 public:
@@ -297,8 +299,8 @@ public:
         SetRegisterDataFrom_LC_THREAD (data);
     }
 
-    virtual void
-    InvalidateAllRegisters ()
+    void
+    InvalidateAllRegisters() override
     {
         // Do nothing... registers are always valid...
     }
@@ -425,38 +427,38 @@ public:
     }
 
 protected:
-    virtual int
-    DoReadGPR (lldb::tid_t tid, int flavor, GPR &gpr)
+    int
+    DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override
     {
         return 0;
     }
 
-    virtual int
-    DoReadFPU (lldb::tid_t tid, int flavor, FPU &fpu)
+    int
+    DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override
     {
         return 0;
     }
 
-    virtual int
-    DoReadEXC (lldb::tid_t tid, int flavor, EXC &exc)
+    int
+    DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteGPR (lldb::tid_t tid, int flavor, const GPR &gpr)
+    int
+    DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteFPU (lldb::tid_t tid, int flavor, const FPU &fpu)
+    int
+    DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteEXC (lldb::tid_t tid, int flavor, const EXC &exc)
+    int
+    DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override
     {
         return 0;
     }
@@ -471,8 +473,8 @@ public:
         SetRegisterDataFrom_LC_THREAD (data);
     }
 
-    virtual void
-    InvalidateAllRegisters ()
+    void
+    InvalidateAllRegisters() override
     {
         // Do nothing... registers are always valid...
     }
@@ -611,50 +613,50 @@ public:
     }
 
 protected:
-    virtual int
-    DoReadGPR (lldb::tid_t tid, int flavor, GPR &gpr)
+    int
+    DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override
     {
         return -1;
     }
 
-    virtual int
-    DoReadFPU (lldb::tid_t tid, int flavor, FPU &fpu)
+    int
+    DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override
     {
         return -1;
     }
 
-    virtual int
-    DoReadEXC (lldb::tid_t tid, int flavor, EXC &exc)
+    int
+    DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override
     {
         return -1;
     }
 
-    virtual int
-    DoReadDBG (lldb::tid_t tid, int flavor, DBG &dbg)
+    int
+    DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) override
     {
         return -1;
     }
 
-    virtual int
-    DoWriteGPR (lldb::tid_t tid, int flavor, const GPR &gpr)
+    int
+    DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteFPU (lldb::tid_t tid, int flavor, const FPU &fpu)
+    int
+    DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteEXC (lldb::tid_t tid, int flavor, const EXC &exc)
+    int
+    DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override
     {
         return 0;
     }
 
-    virtual int
-    DoWriteDBG (lldb::tid_t tid, int flavor, const DBG &dbg)
+    int
+    DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) override
     {
         return -1;
     }
@@ -669,8 +671,8 @@ public:
         SetRegisterDataFrom_LC_THREAD (data);
     }
     
-    virtual void
-    InvalidateAllRegisters ()
+    void
+    InvalidateAllRegisters() override
     {
         // Do nothing... registers are always valid...
     }
@@ -819,50 +821,50 @@ public:
     }
 
 protected:
-    virtual int
-    DoReadGPR (lldb::tid_t tid, int flavor, GPR &gpr)
+    int
+    DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override
     {
         return -1;
     }
     
-    virtual int
-    DoReadFPU (lldb::tid_t tid, int flavor, FPU &fpu)
+    int
+    DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override
     {
         return -1;
     }
     
-    virtual int
-    DoReadEXC (lldb::tid_t tid, int flavor, EXC &exc)
+    int
+    DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override
     {
         return -1;
     }
 
-    virtual int
-    DoReadDBG (lldb::tid_t tid, int flavor, DBG &dbg)
+    int
+    DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) override
     {
         return -1;
     }
     
-    virtual int
-    DoWriteGPR (lldb::tid_t tid, int flavor, const GPR &gpr)
+    int
+    DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override
     {
         return 0;
     }
     
-    virtual int
-    DoWriteFPU (lldb::tid_t tid, int flavor, const FPU &fpu)
+    int
+    DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override
     {
         return 0;
     }
     
-    virtual int
-    DoWriteEXC (lldb::tid_t tid, int flavor, const EXC &exc)
+    int
+    DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override
     {
         return 0;
     }
     
-    virtual int
-    DoWriteDBG (lldb::tid_t tid, int flavor, const DBG &dbg)
+    int
+    DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) override
     {
         return -1;
     }
@@ -907,7 +909,6 @@ ObjectFileMachO::Terminate()
     PluginManager::UnregisterPlugin (CreateInstance);
 }
 
-
 lldb_private::ConstString
 ObjectFileMachO::GetPluginNameStatic()
 {
@@ -1010,8 +1011,6 @@ ObjectFileMachO::GetModuleSpecifications (const lldb_private::FileSpec& file,
     return specs.GetSize() - initial_count;
 }
 
-
-
 const ConstString &
 ObjectFileMachO::GetSegmentNameTEXT()
 {
@@ -1073,7 +1072,6 @@ ObjectFileMachO::MagicBytesMatch (DataBufferSP& data_sp,
     return MachHeaderSizeFromMagic(magic) != 0;
 }
 
-
 ObjectFileMachO::ObjectFileMachO(const lldb::ModuleSP &module_sp,
                                  DataBufferSP& data_sp,
                                  lldb::offset_t data_offset,
@@ -1106,10 +1104,6 @@ ObjectFileMachO::ObjectFileMachO (const lldb::ModuleSP &module_sp,
     ::memset (&m_dysymtab, 0, sizeof(m_dysymtab));
 }
 
-ObjectFileMachO::~ObjectFileMachO()
-{
-}
-
 bool
 ObjectFileMachO::ParseHeader (DataExtractor &data,
                               lldb::offset_t *data_offset_ptr,
@@ -1255,7 +1249,6 @@ ObjectFileMachO::ParseHeader ()
     return false;
 }
 
-
 ByteOrder
 ObjectFileMachO::GetByteOrder () const
 {
@@ -1945,7 +1938,6 @@ ObjectFileMachO::CreateSections (SectionList &unified_section_list)
 class MachSymtabSectionInfo
 {
 public:
-
     MachSymtabSectionInfo (SectionList *section_list) :
         m_section_list (section_list),
         m_section_infos()
@@ -1956,7 +1948,6 @@ public:
         m_section_infos.resize(section_list->GetNumSections(1));
     }
 
-
     SectionSP
     GetSection (uint8_t n_sect, addr_t file_addr)
     {
@@ -2440,7 +2431,6 @@ ObjectFileMachO::ParseSymtab ()
             return 0;
         }
 
-
         const bool have_strtab_data = strtab_data.GetByteSize() > 0;
         if (!have_strtab_data)
         {
@@ -2636,6 +2626,7 @@ ObjectFileMachO::ParseSymtab ()
                 uint64_t    localSymbolsOffset;   // file offset of where local symbols are stored
                 uint64_t    localSymbolsSize;     // size of local symbols information
             };
+
             struct lldb_copy_dyld_cache_header_v1
             {
                 char        magic[16];            // e.g. "dyld_v0    i386", "dyld_v1   armv7", etc.
@@ -2671,6 +2662,7 @@ ObjectFileMachO::ParseSymtab ()
                 uint32_t        entriesOffset;
                 uint32_t        entriesCount;
             };
+
             struct lldb_copy_dyld_cache_local_symbols_entry
             {
                 uint32_t        dylibOffset;
@@ -2966,7 +2958,6 @@ ObjectFileMachO::ParseSymtab ()
                                                         add_nlist = false;
                                                         break;
 
-
                                                     case N_OPT:
                                                         // emitted with gcc2_compiled and in gcc source
                                                         type = eSymbolTypeCompiler;
@@ -3922,7 +3913,6 @@ ObjectFileMachO::ParseSymtab ()
                                 N_SO_index = sym_idx;
                             }
                         }
-
                         break;
 
                     case N_OSO:
@@ -4460,7 +4450,6 @@ ObjectFileMachO::ParseSymtab ()
                         sym[pos.first].SetReExportedSymbolSharedLibrary(dylib_files.GetFileSpecAtIndex(dylib_ordinal-1));
                 }
             }
-
         }
 
         uint32_t synthetic_sym_id = symtab_load_command.nsyms;
@@ -4646,7 +4635,6 @@ ObjectFileMachO::ParseSymtab ()
             }
         }
 
-        
         if (!trie_entries.empty())
         {
             for (const auto &e : trie_entries)
@@ -4674,9 +4662,7 @@ ObjectFileMachO::ParseSymtab ()
                 }
             }
         }
-
-
-        
+       
 //        StreamFile s(stdout, false);
 //        s.Printf ("Symbol table before CalculateSymbolSizes():\n");
 //        symtab->Dump(&s, NULL, eSortOrderNone);
@@ -4691,7 +4677,6 @@ ObjectFileMachO::ParseSymtab ()
     return 0;
 }
 
-
 void
 ObjectFileMachO::Dump (Stream *s)
 {
@@ -4764,7 +4749,6 @@ ObjectFileMachO::GetUUID (const llvm::MachO::mach_header &header,
     return false;
 }
 
-
 bool
 ObjectFileMachO::GetArchitecture (const llvm::MachO::mach_header &header,
                                   const lldb_private::DataExtractor &data,
@@ -4836,7 +4820,6 @@ ObjectFileMachO::GetUUID (lldb_private::UUID* uuid)
     return false;
 }
 
-
 uint32_t
 ObjectFileMachO::GetDependentModules (FileSpecList& files)
 {
@@ -5096,7 +5079,6 @@ ObjectFileMachO::GetEntryPointAddress ()
     }
 
     return m_entry_point_address;
-
 }
 
 lldb_private::Address
@@ -5191,7 +5173,6 @@ ObjectFileMachO::GetThreadContextAtIndex (uint32_t idx, lldb_private::Thread &th
     return reg_ctx_sp;
 }
 
-
 ObjectFile::Type
 ObjectFileMachO::CalculateType()
 {
@@ -5287,7 +5268,6 @@ ObjectFileMachO::CalculateStrata()
     return eStrataUnknown;
 }
 
-
 uint32_t
 ObjectFileMachO::GetVersion (uint32_t *versions, uint32_t num_versions)
 {
@@ -5355,7 +5335,6 @@ ObjectFileMachO::GetArchitecture (ArchSpec &arch)
     return false;
 }
 
-
 UUID
 ObjectFileMachO::GetProcessSharedCacheUUID (Process *process)
 {
@@ -5550,7 +5529,6 @@ ObjectFileMachO::GetSDKVersion(uint32_t *versions, uint32_t num_versions)
     return ObjectFile::GetSDKVersion (versions, num_versions);
 }
 
-
 bool
 ObjectFileMachO::GetIsDynamicLinkEditor()
 {
@@ -5572,7 +5550,6 @@ ObjectFileMachO::GetPluginVersion()
     return 1;
 }
 
-
 Section *
 ObjectFileMachO::GetMachHeaderSection()
 {
@@ -6036,4 +6013,3 @@ ObjectFileMachO::SaveCore (const lldb::ProcessSP &process_sp,
     }
     return false;
 }
-