[LLDB] Fix Clang-tidy misc-use-override warnings in some files in source/Plugins, unify closing inclusion guards and code layout

[Eugene.Zelenko]

Summary

I also removed deprecated GetShortPluginName().

I checked this patch on my own build on RHEL 6.

Please check it in if it's OK, because I don't have SVN write access.

[brucem]

There are a number of places where you've changed spaces to tabs ... Also the GetShortPluginName has already been removed. Please rebase forward and correct the whitespace issues.

source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h

100

This looks like a whitespace error. Why introduce tabs here?

source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h

 class EmulateInstructionARM64 : public lldb_private::EmulateInstruction
 {
 public: 
+    EmulateInstructionARM64(const lldb_private::ArchSpec &arch) :
+        EmulateInstruction(arch),
+        m_opcode_pstate(),
+        m_emulated_pstate(),
+        m_ignore_conditions(false)
+    {
+    }
+
     static void
     Initialize ();
     

         return false;
     }
 
-    virtual lldb_private::ConstString
-    GetPluginName();
+    lldb_private::ConstString
+    GetPluginName() override;
 
-    virtual lldb_private::ConstString
-    GetShortPluginName()
+    uint32_t
+    GetPluginVersion() override
     {
-        return GetPluginNameStatic();
-    }
-
-    virtual uint32_t
-    GetPluginVersion()
-    {
         return 1;
     }
 
     bool
-    SetTargetTriple (const lldb_private::ArchSpec &arch);
+    SetTargetTriple(const lldb_private::ArchSpec &arch) override;
     
-    EmulateInstructionARM64 (const lldb_private::ArchSpec &arch) :
-        EmulateInstruction (arch),
-        m_opcode_pstate (),
-        m_emulated_pstate (),
-        m_ignore_conditions (false)
+    bool
+    SupportsEmulatingInstructionsOfType(lldb_private::InstructionType inst_type) override
     {
-    }
-
-    virtual bool
-    SupportsEmulatingInstructionsOfType (lldb_private::InstructionType inst_type)
-    {
         return SupportsEmulatingInstructionsOfTypeStatic (inst_type);
     }
 
-    virtual bool 
-    ReadInstruction ();
+    bool
+    ReadInstruction() override;
     
-    virtual bool
-    EvaluateInstruction (uint32_t evaluate_options);
+    bool
+    EvaluateInstruction(uint32_t evaluate_options) override;
     
-    virtual bool
-    TestEmulation (lldb_private::Stream *out_stream, 
-                   lldb_private::ArchSpec &arch, 
-                   lldb_private::OptionValueDictionary *test_data)
+    bool
+    TestEmulation(lldb_private::Stream *out_stream, 
+      lldb_private::ArchSpec &arch, 
+      lldb_private::OptionValueDictionary *test_data) override
     {
         return false;
     }
 
-    virtual bool
-    GetRegisterInfo (lldb::RegisterKind reg_kind,
-                     uint32_t reg_num, 
-                     lldb_private::RegisterInfo &reg_info);
+    bool
+    GetRegisterInfo(lldb::RegisterKind reg_kind,
+        uint32_t reg_num, 
+        lldb_private::RegisterInfo &reg_info) override;
 
-    virtual bool
-    CreateFunctionEntryUnwind (lldb_private::UnwindPlan &unwind_plan);
+    bool
+    CreateFunctionEntryUnwind(lldb_private::UnwindPlan &unwind_plan) override;
 
-    
     typedef enum 
     {
         AddrMode_OFF, 

     bool m_ignore_conditions;
 };
 
-#endif  // EmulateInstructionARM64_h_
+#endif // EmulateInstructionARM64_h_

source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h

     class MCContext;
     class MCInstrInfo;
     class MCInst;
-}
+} // namespace llvm
 
 #include "lldb/Core/EmulateInstruction.h"
 #include "lldb/Core/Error.h"

 class EmulateInstructionMIPS : public lldb_private::EmulateInstruction
 {
 public: 
+    EmulateInstructionMIPS(const lldb_private::ArchSpec &arch);
+
     static void
     Initialize ();
 

         return false;
     }
 
-    virtual lldb_private::ConstString
-    GetPluginName();
+    lldb_private::ConstString
+    GetPluginName() override;
 
-    virtual lldb_private::ConstString
-    GetShortPluginName()
+    uint32_t
+    GetPluginVersion() override
     {
-        return GetPluginNameStatic();
-    }
-
-    virtual uint32_t
-    GetPluginVersion()
-    {
         return 1;
     }
 
     bool
-    SetTargetTriple (const lldb_private::ArchSpec &arch);
+    SetTargetTriple(const lldb_private::ArchSpec &arch) override;
     
-    EmulateInstructionMIPS (const lldb_private::ArchSpec &arch);
-
-    virtual bool
-    SupportsEmulatingInstructionsOfType (lldb_private::InstructionType inst_type)
+    bool
+    SupportsEmulatingInstructionsOfType(lldb_private::InstructionType inst_type) override
     {
         return SupportsEmulatingInstructionsOfTypeStatic (inst_type);
     }
 
-    virtual bool 
-    ReadInstruction ();
+    bool
+    ReadInstruction() override;
     
-    virtual bool
-    EvaluateInstruction (uint32_t evaluate_options);
+    bool
+    EvaluateInstruction(uint32_t evaluate_options) override;
     
-    virtual bool
-    TestEmulation (lldb_private::Stream *out_stream, 
-                   lldb_private::ArchSpec &arch, 
-                   lldb_private::OptionValueDictionary *test_data)
+    bool
+    TestEmulation(lldb_private::Stream *out_stream, 
+      lldb_private::ArchSpec &arch, 
+      lldb_private::OptionValueDictionary *test_data) override
     {
         return false;
     }
 
-    virtual bool
-    GetRegisterInfo (lldb::RegisterKind reg_kind,
-                     uint32_t reg_num, 
-                     lldb_private::RegisterInfo &reg_info);
+    bool
+    GetRegisterInfo(lldb::RegisterKind reg_kind,
+        uint32_t reg_num, 
+        lldb_private::RegisterInfo &reg_info) override;
 
-    virtual bool
-    CreateFunctionEntryUnwind (lldb_private::UnwindPlan &unwind_plan);
+    bool
+    CreateFunctionEntryUnwind(lldb_private::UnwindPlan &unwind_plan) override;
 
-
 protected:
 
     typedef struct

     std::unique_ptr<llvm::MCInstrInfo>      m_insn_info;
 };
 
-#endif  // EmulateInstructionMIPS_h_
+#endif // EmulateInstructionMIPS_h_

source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h

     class MCContext;
     class MCInstrInfo;
     class MCInst;
-}
+} // namespace llvm
 
 #include "lldb/Core/EmulateInstruction.h"
 #include "lldb/Core/Error.h"

 class EmulateInstructionMIPS64 : public lldb_private::EmulateInstruction
 {
 public: 
+    EmulateInstructionMIPS64(const lldb_private::ArchSpec &arch);
+
     static void
     Initialize ();
 

         return false;
     }
 
-    virtual lldb_private::ConstString
-    GetPluginName();
+    lldb_private::ConstString
+    GetPluginName() override;
 
-    virtual lldb_private::ConstString
-    GetShortPluginName()
+    uint32_t
+    GetPluginVersion() override
     {
-        return GetPluginNameStatic();
-    }
-
-    virtual uint32_t
-    GetPluginVersion()
-    {
         return 1;
     }
 
     bool
-    SetTargetTriple (const lldb_private::ArchSpec &arch);
+    SetTargetTriple(const lldb_private::ArchSpec &arch) override;
     
-    EmulateInstructionMIPS64 (const lldb_private::ArchSpec &arch);
-
-    virtual bool
-    SupportsEmulatingInstructionsOfType (lldb_private::InstructionType inst_type)
+    bool
+    SupportsEmulatingInstructionsOfType(lldb_private::InstructionType inst_type) override
     {
         return SupportsEmulatingInstructionsOfTypeStatic (inst_type);
     }
 
-    virtual bool 
-    ReadInstruction ();
+    bool
+    ReadInstruction() override;
     
-    virtual bool
-    EvaluateInstruction (uint32_t evaluate_options);
+    bool
+    EvaluateInstruction(uint32_t evaluate_options) override;
     
-    virtual bool
-    TestEmulation (lldb_private::Stream *out_stream, 
-                   lldb_private::ArchSpec &arch, 
-                   lldb_private::OptionValueDictionary *test_data)
+    bool
+    TestEmulation(lldb_private::Stream *out_stream, 
+      lldb_private::ArchSpec &arch, 
+      lldb_private::OptionValueDictionary *test_data) override
     {
         return false;
     }
 
-    virtual bool
-    GetRegisterInfo (lldb::RegisterKind reg_kind,
-                     uint32_t reg_num, 
-                     lldb_private::RegisterInfo &reg_info);
+    bool
+    GetRegisterInfo(lldb::RegisterKind reg_kind,
+        uint32_t reg_num, 
+        lldb_private::RegisterInfo &reg_info) override;
 
-    virtual bool
-    CreateFunctionEntryUnwind (lldb_private::UnwindPlan &unwind_plan);
+    bool
+    CreateFunctionEntryUnwind(lldb_private::UnwindPlan &unwind_plan) override;
 
-
 protected:
 
     typedef struct

     std::unique_ptr<llvm::MCInstrInfo>      m_insn_info;
 };
 
-#endif  // EmulateInstructionMIPS64_h_
+#endif // EmulateInstructionMIPS64_h_

source/Plugins/InstrumentationRuntime/AddressSanitizer/AddressSanitizerRuntime.h

     static lldb::InstrumentationRuntimeType
     GetTypeStatic();
     
-    virtual
-    ~AddressSanitizerRuntime();
+    ~AddressSanitizerRuntime() override;
     
-    virtual lldb_private::ConstString
-    GetPluginName() { return GetPluginNameStatic(); }
+    lldb_private::ConstString
+    GetPluginName() override
+    {
+        return GetPluginNameStatic();
+    }
     
     virtual lldb::InstrumentationRuntimeType
     GetType() { return GetTypeStatic(); }
     
-    virtual uint32_t
-    GetPluginVersion() { return 1; }
+    uint32_t
+    GetPluginVersion() override
+    {
+        return 1;
+    }
     
-    virtual void
-    ModulesDidLoad(lldb_private::ModuleList &module_list);
+    void
+    ModulesDidLoad(lldb_private::ModuleList &module_list) override;
     
-    virtual bool
-    IsActive();
+    bool
+    IsActive() override;
     
 private:
     

     lldb::ModuleSP m_runtime_module;
     lldb::ProcessSP m_process;
     lldb::user_id_t m_breakpoint_id;
-
 };
     
 } // namespace lldb_private
 
-#endif  // liblldb_InstrumentationRuntime_h_
+#endif // liblldb_AddressSanitizerRuntime_h_

source/Plugins/MemoryHistory/asan/MemoryHistoryASan.h

 class MemoryHistoryASan : public lldb_private::MemoryHistory
 {
 public:
+    ~MemoryHistoryASan () override = default;
     
     static lldb::MemoryHistorySP
     CreateInstance (const lldb::ProcessSP &process_sp);

     static lldb_private::ConstString
     GetPluginNameStatic();
     
-    virtual
-    ~MemoryHistoryASan () {}
+    lldb_private::ConstString
+    GetPluginName() override
+    {
+        return GetPluginNameStatic();
+    }
     
-    virtual lldb_private::ConstString
-    GetPluginName() { return GetPluginNameStatic(); }
+    uint32_t
+    GetPluginVersion() override
+    {
+        return 1;
+    }
+
+    lldb_private::HistoryThreads
+    GetHistoryThreads(lldb::addr_t address) override;
     
-    virtual uint32_t
-    GetPluginVersion() { return 1; }
-    
-    virtual lldb_private::HistoryThreads
-    GetHistoryThreads(lldb::addr_t address);
-    
 private:
     
     MemoryHistoryASan(const lldb::ProcessSP &process_sp);
     
     lldb::ProcessSP m_process_sp;
-    
 };
 
 } // namespace lldb_private
     
-#endif  // liblldb_MemoryHistoryASan_h_
+#endif // liblldb_MemoryHistoryASan_h_

source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h

   public:
     ScriptInterpreterNone(CommandInterpreter &interpreter);
 
-    ~ScriptInterpreterNone();
+    ~ScriptInterpreterNone() override;
 
     bool
     ExecuteOneLine(const char *command, CommandReturnObject *result,
-                   const ExecuteScriptOptions &options = ExecuteScriptOptions());
+                   const ExecuteScriptOptions &options = ExecuteScriptOptions()) override;
 
     void
-    ExecuteInterpreterLoop();
+    ExecuteInterpreterLoop() override;
 
     //------------------------------------------------------------------
     // Static Functions

     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
-    virtual lldb_private::ConstString
-    GetPluginName();
+    lldb_private::ConstString
+    GetPluginName() override;
 
-    virtual uint32_t
-    GetPluginVersion();
+    uint32_t
+    GetPluginVersion() override;
 };
 
 } // namespace lldb_private
 
-#endif // #ifndef liblldb_ScriptInterpreterNone_h_
+#endif // liblldb_ScriptInterpreterNone_h_

source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h

         Py_XINCREF(GetValue());
     }
 
-    virtual ~StructuredPythonObject()
+    ~StructuredPythonObject() override
     {
         if (Py_IsInitialized())
             Py_XDECREF(GetValue());

         PythonString (const PythonObject &object);
         PythonString (llvm::StringRef string);
         PythonString (const char *string);
-        virtual ~PythonString ();
+        ~PythonString() override;
 
-        virtual bool
-        Reset (PyObject* py_obj = NULL);
+        bool
+        Reset(PyObject* py_obj = NULL) override;
 
         llvm::StringRef
         GetString() const;

         PythonInteger (PyObject* py_obj);
         PythonInteger (const PythonObject &object);
         PythonInteger (int64_t value);
-        virtual ~PythonInteger ();
+        ~PythonInteger() override;
         
-        virtual bool
-        Reset (PyObject* py_obj = NULL);
+        bool
+        Reset(PyObject* py_obj = NULL) override;
 
         int64_t GetInteger() const;
 

         PythonList (PyObject* py_obj);
         PythonList (const PythonObject &object);
         PythonList (uint32_t count);
-        virtual ~PythonList ();
+        ~PythonList() override;
         
-        virtual bool
-        Reset (PyObject* py_obj = NULL);
+        bool
+        Reset(PyObject* py_obj = NULL) override;
 
         uint32_t GetSize() const;
 

         explicit PythonDictionary (bool create_empty);
         PythonDictionary (PyObject* object);
         PythonDictionary (const PythonObject &object);
-        virtual ~PythonDictionary ();
+        ~PythonDictionary() override;
         
-        virtual bool
-        Reset (PyObject* object = NULL);
+        bool
+        Reset(PyObject* object = NULL) override;
 
         uint32_t GetSize() const;
 

source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h

         return m_dictionary_name.c_str();
     }
 
-    
     PyThreadState *
     GetThreadState()
     {

     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
-    virtual lldb_private::ConstString
+    lldb_private::ConstString
     GetPluginName() override;
     
-    virtual uint32_t
+    uint32_t
     GetPluginVersion() override;
 
 protected:

 //      FILE*                    m_tmp_fh;
         PyGILState_STATE         m_GILState;
   };
+
 protected:
     enum class AddLocation
     {

         eIOHandlerBreakpoint,
         eIOHandlerWatchpoint
     };
+
     PythonObject &
     GetMainModule ();
     

source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h

 {
 public:
 
-    virtual
-    ~UnwindAssemblyInstEmulation () 
-    {
-    }
+    ~UnwindAssemblyInstEmulation() override = default;
 
-    virtual bool
-    GetNonCallSiteUnwindPlanFromAssembly (lldb_private::AddressRange& func, 
-                                          lldb_private::Thread& thread, 
-                                          lldb_private::UnwindPlan& unwind_plan);
+    bool
+    GetNonCallSiteUnwindPlanFromAssembly(lldb_private::AddressRange& func,
+           lldb_private::Thread& thread,
+           lldb_private::UnwindPlan& unwind_plan) override;
 
-    virtual bool
-    AugmentUnwindPlanFromCallSite (lldb_private::AddressRange& func,
-                                   lldb_private::Thread& thread,
-                                   lldb_private::UnwindPlan& unwind_plan);
+    bool
+    AugmentUnwindPlanFromCallSite(lldb_private::AddressRange& func,
+          lldb_private::Thread& thread,
+          lldb_private::UnwindPlan& unwind_plan) override;
 
-    virtual bool
-    GetFastUnwindPlan (lldb_private::AddressRange& func, 
-                       lldb_private::Thread& thread, 
-                       lldb_private::UnwindPlan &unwind_plan);
+    bool
+    GetFastUnwindPlan(lldb_private::AddressRange& func,
+          lldb_private::Thread& thread,
+          lldb_private::UnwindPlan &unwind_plan) override;
 
     // thread may be NULL in which case we only use the Target (e.g. if this is called pre-process-launch).
-    virtual bool
-    FirstNonPrologueInsn (lldb_private::AddressRange& func, 
-                          const lldb_private::ExecutionContext &exe_ctx, 
-                          lldb_private::Address& first_non_prologue_insn);
+    bool
+    FirstNonPrologueInsn(lldb_private::AddressRange& func,
+       const lldb_private::ExecutionContext &exe_ctx,
+       lldb_private::Address& first_non_prologue_insn) override;
 
     static lldb_private::UnwindAssembly *
     CreateInstance (const lldb_private::ArchSpec &arch);

     static const char *
     GetPluginDescriptionStatic();
 
-    virtual lldb_private::ConstString
-    GetPluginName();
+    lldb_private::ConstString
+    GetPluginName() override;
     
-    virtual uint32_t
-    GetPluginVersion();
+    uint32_t
+    GetPluginVersion() override;
     
 private:
     

source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h

 {
 public:
 
-    ~UnwindAssembly_x86 ();
+    ~UnwindAssembly_x86() override;
 
-    virtual bool
-    GetNonCallSiteUnwindPlanFromAssembly (lldb_private::AddressRange& func, 
-                                          lldb_private::Thread& thread, 
-                                          lldb_private::UnwindPlan& unwind_plan);
+    bool
+    GetNonCallSiteUnwindPlanFromAssembly(lldb_private::AddressRange& func, 
+           lldb_private::Thread& thread, 
+           lldb_private::UnwindPlan& unwind_plan) override;
 
-    virtual bool
-    AugmentUnwindPlanFromCallSite (lldb_private::AddressRange& func,
-                                   lldb_private::Thread& thread,
-                                   lldb_private::UnwindPlan& unwind_plan);
+    bool
+    AugmentUnwindPlanFromCallSite(lldb_private::AddressRange& func,
+          lldb_private::Thread& thread,
+          lldb_private::UnwindPlan& unwind_plan) override;
 
-    virtual bool
-    GetFastUnwindPlan (lldb_private::AddressRange& func, 
-                       lldb_private::Thread& thread, 
-                       lldb_private::UnwindPlan &unwind_plan);
+    bool
+    GetFastUnwindPlan(lldb_private::AddressRange& func,
+          lldb_private::Thread& thread,
+          lldb_private::UnwindPlan &unwind_plan) override;
 
     // thread may be NULL in which case we only use the Target (e.g. if this is called pre-process-launch).
-    virtual bool
-    FirstNonPrologueInsn (lldb_private::AddressRange& func, 
-                          const lldb_private::ExecutionContext &exe_ctx,
-                          lldb_private::Address& first_non_prologue_insn);
+    bool
+    FirstNonPrologueInsn(lldb_private::AddressRange& func,
+       const lldb_private::ExecutionContext &exe_ctx,
+       lldb_private::Address& first_non_prologue_insn) override;
 
     static lldb_private::UnwindAssembly *
     CreateInstance (const lldb_private::ArchSpec &arch);
 
-
     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------

     static const char *
     GetPluginDescriptionStatic();
 
-    virtual lldb_private::ConstString
-    GetPluginName();
+    lldb_private::ConstString
+    GetPluginName() override;
     
-    virtual uint32_t
-    GetPluginVersion();
+    uint32_t
+    GetPluginVersion() override;
     
 private:
     UnwindAssembly_x86 (const lldb_private::ArchSpec &arch, int cpu);

     lldb_private::ArchSpec m_arch;
 };
 
-
 #endif // liblldb_UnwindAssembly_x86_h_