From bcd891f417ca06b76cdabf368db8bf9b02305aaf Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Wed, 8 Apr 2015 17:22:09 +0000 Subject: [PATCH] Remove redundant virtual for member functions marked 'override'. llvm-svn: 234422 --- .../Interpreter/ScriptInterpreterPython.h | 7 ++- .../Symbol/ClangExternalASTSourceCallbacks.h | 9 ++-- .../Platform/Kalimba/PlatformKalimba.h | 49 +++++++------------ .../Platform/MacOSX/PlatformDarwinKernel.h | 2 +- .../Plugins/Platform/MacOSX/PlatformMacOSX.h | 11 ++--- .../Process/Windows/DynamicLoaderWindows.h | 6 +-- .../Process/Windows/LocalDebugDelegate.h | 18 +++---- .../Plugins/Process/elf-core/ProcessElfCore.h | 39 +++++---------- 8 files changed, 55 insertions(+), 86 deletions(-) diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h b/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h index 3e8aa21adb42..e37b9cac6ccc 100644 --- a/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h +++ b/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h @@ -346,10 +346,9 @@ public: StringList ReadCommandInputFromUser (FILE *in_file); - - virtual void - ResetOutputFileHandle (FILE *new_fh) override; - + + void ResetOutputFileHandle(FILE *new_fh) override; + static void InitializePrivate (); diff --git a/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h b/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h index 91cb3d05c656..41bb235636f0 100644 --- a/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h +++ b/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h @@ -100,7 +100,7 @@ public: return; } - virtual clang::ExternalLoadResult + clang::ExternalLoadResult FindExternalLexicalDecls(const clang::DeclContext *decl_ctx, bool (*isKindWeWant)(clang::Decl::Kind), llvm::SmallVectorImpl &decls) override { @@ -109,12 +109,11 @@ public: return clang::ELR_Failure; } - virtual bool FindExternalVisibleDeclsByName(const clang::DeclContext *decl_ctx, - clang::DeclarationName decl_name) override; + bool FindExternalVisibleDeclsByName(const clang::DeclContext *decl_ctx, clang::DeclarationName decl_name) override; - virtual void CompleteType(clang::TagDecl *tag_decl) override; + void CompleteType(clang::TagDecl *tag_decl) override; - virtual void CompleteType(clang::ObjCInterfaceDecl *objc_decl) override; + void CompleteType(clang::ObjCInterfaceDecl *objc_decl) override; bool layoutRecordType(const clang::RecordDecl *Record, uint64_t &Size, uint64_t &Alignment, llvm::DenseMap &FieldOffsets, diff --git a/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.h b/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.h index ebf955b78736..92de05cf19a4 100644 --- a/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.h +++ b/lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.h @@ -45,10 +45,9 @@ namespace lldb_private { static const char * GetPluginDescriptionStatic (bool is_host); - virtual lldb_private::ConstString - GetPluginName() override; - - virtual uint32_t + lldb_private::ConstString GetPluginName() override; + + uint32_t GetPluginVersion() override { return 1; @@ -57,50 +56,38 @@ namespace lldb_private { //------------------------------------------------------------ // lldb_private::Platform functions //------------------------------------------------------------ - virtual Error - ResolveExecutable (const lldb_private::ModuleSpec &module_spec, - lldb::ModuleSP &module_sp, - const FileSpecList *module_search_paths_ptr) override; + Error ResolveExecutable(const lldb_private::ModuleSpec &module_spec, lldb::ModuleSP &module_sp, + const FileSpecList *module_search_paths_ptr) override; - virtual const char * - GetDescription () override + const char * + GetDescription() override { return GetPluginDescriptionStatic(IsHost()); } - virtual void - GetStatus (Stream &strm) override; + void GetStatus(Stream &strm) override; - virtual Error - GetFileWithUUID (const FileSpec &platform_file, - const UUID* uuid, FileSpec &local_file) override; + Error GetFileWithUUID(const FileSpec &platform_file, const UUID *uuid, FileSpec &local_file) override; - virtual bool - GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &proc_info) override; + bool GetProcessInfo(lldb::pid_t pid, ProcessInstanceInfo &proc_info) override; - virtual bool - GetSupportedArchitectureAtIndex (uint32_t idx, ArchSpec &arch) override; + bool GetSupportedArchitectureAtIndex(uint32_t idx, ArchSpec &arch) override; - virtual size_t - GetSoftwareBreakpointTrapOpcode (Target &target, - BreakpointSite *bp_site) override; + size_t GetSoftwareBreakpointTrapOpcode(Target &target, BreakpointSite *bp_site) override; - virtual lldb_private::Error - LaunchProcess (lldb_private::ProcessLaunchInfo &launch_info) override; + lldb_private::Error LaunchProcess(lldb_private::ProcessLaunchInfo &launch_info) override; - virtual lldb::ProcessSP - Attach(ProcessAttachInfo &attach_info, Debugger &debugger, - Target *target, Error &error) override; + lldb::ProcessSP Attach(ProcessAttachInfo &attach_info, Debugger &debugger, Target *target, + Error &error) override; // Kalimba processes can not be launched by spawning and attaching. - virtual bool - CanDebugProcess () override + bool + CanDebugProcess() override { return false; } - virtual void - CalculateTrapHandlerSymbolNames () override; + void CalculateTrapHandlerSymbolNames() override; Error LaunchNativeProcess ( diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h index decc835fb526..25344e6918c6 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h @@ -65,7 +65,7 @@ public: return GetPluginNameStatic(); } - virtual uint32_t + uint32_t GetPluginVersion() override { return 1; diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h index 0b8d35b8b036..e2694b781f8a 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h @@ -91,14 +91,11 @@ public: GetFileWithUUID (const lldb_private::FileSpec &platform_file, const lldb_private::UUID *uuid_ptr, lldb_private::FileSpec &local_file) override; - - virtual bool - GetSupportedArchitectureAtIndex (uint32_t idx, - lldb_private::ArchSpec &arch) override; - virtual lldb_private::ConstString - GetSDKDirectory (lldb_private::Target &target) override; - + bool GetSupportedArchitectureAtIndex(uint32_t idx, lldb_private::ArchSpec &arch) override; + + lldb_private::ConstString GetSDKDirectory(lldb_private::Target &target) override; + void AddClangModuleCompilationOptions (lldb_private::Target *target, std::vector &options) override { diff --git a/lldb/source/Plugins/Process/Windows/DynamicLoaderWindows.h b/lldb/source/Plugins/Process/Windows/DynamicLoaderWindows.h index b9cfb92eae0f..304c6f8f639b 100644 --- a/lldb/source/Plugins/Process/Windows/DynamicLoaderWindows.h +++ b/lldb/source/Plugins/Process/Windows/DynamicLoaderWindows.h @@ -34,10 +34,10 @@ class DynamicLoaderWindows : public DynamicLoader Error CanLoadImage () override; lldb::ThreadPlanSP GetStepThroughTrampolinePlan(Thread &thread, bool stop) override; - virtual ConstString GetPluginName() override; - virtual uint32_t GetPluginVersion() override; + ConstString GetPluginName() override; + uint32_t GetPluginVersion() override; }; } -#endif \ No newline at end of file +#endif diff --git a/lldb/source/Plugins/Process/Windows/LocalDebugDelegate.h b/lldb/source/Plugins/Process/Windows/LocalDebugDelegate.h index 8aade4d3e743..c557fae2bbcc 100644 --- a/lldb/source/Plugins/Process/Windows/LocalDebugDelegate.h +++ b/lldb/source/Plugins/Process/Windows/LocalDebugDelegate.h @@ -42,15 +42,15 @@ class LocalDebugDelegate : public IDebugDelegate public: explicit LocalDebugDelegate(lldb::ProcessSP process); - virtual void OnExitProcess(uint32_t exit_code) override; - virtual void OnDebuggerConnected(lldb::addr_t image_base) override; - virtual ExceptionResult OnDebugException(bool first_chance, const ExceptionRecord &record) override; - virtual void OnCreateThread(const HostThread &thread) override; - virtual void OnExitThread(const HostThread &thread) override; - virtual void OnLoadDll(const lldb_private::ModuleSpec &module_spec, lldb::addr_t module_addr) override; - virtual void OnUnloadDll(lldb::addr_t module_addr) override; - virtual void OnDebugString(const std::string &message) override; - virtual void OnDebuggerError(const Error &error, uint32_t type) override; + void OnExitProcess(uint32_t exit_code) override; + void OnDebuggerConnected(lldb::addr_t image_base) override; + ExceptionResult OnDebugException(bool first_chance, const ExceptionRecord &record) override; + void OnCreateThread(const HostThread &thread) override; + void OnExitThread(const HostThread &thread) override; + void OnLoadDll(const lldb_private::ModuleSpec &module_spec, lldb::addr_t module_addr) override; + void OnUnloadDll(lldb::addr_t module_addr) override; + void OnDebugString(const std::string &message) override; + void OnDebuggerError(const Error &error, uint32_t type) override; private: lldb::ProcessSP m_process; diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h index 7988bee5ae53..775d9e94dd8e 100644 --- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h +++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h @@ -66,54 +66,42 @@ public: //------------------------------------------------------------------ // Check if a given Process //------------------------------------------------------------------ - virtual bool - CanDebug (lldb_private::Target &target, - bool plugin_specified_by_name) override; + bool CanDebug(lldb_private::Target &target, bool plugin_specified_by_name) override; //------------------------------------------------------------------ // Creating a new process, or attaching to an existing one //------------------------------------------------------------------ - virtual lldb_private::Error - DoLoadCore () override; + lldb_private::Error DoLoadCore() override; - virtual lldb_private::DynamicLoader * - GetDynamicLoader () override; + lldb_private::DynamicLoader *GetDynamicLoader() override; //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual lldb_private::ConstString - GetPluginName() override; + lldb_private::ConstString GetPluginName() override; - virtual uint32_t - GetPluginVersion() override; + uint32_t GetPluginVersion() override; //------------------------------------------------------------------ // Process Control //------------------------------------------------------------------ - virtual lldb_private::Error - DoDestroy () override; + lldb_private::Error DoDestroy() override; - virtual void - RefreshStateAfterStop() override; + void RefreshStateAfterStop() override; //------------------------------------------------------------------ // Process Queries //------------------------------------------------------------------ - virtual bool - IsAlive () override; + bool IsAlive() override; //------------------------------------------------------------------ // Process Memory //------------------------------------------------------------------ - virtual size_t - ReadMemory (lldb::addr_t addr, void *buf, size_t size, lldb_private::Error &error) override; + size_t ReadMemory(lldb::addr_t addr, void *buf, size_t size, lldb_private::Error &error) override; - virtual size_t - DoReadMemory (lldb::addr_t addr, void *buf, size_t size, lldb_private::Error &error) override; + size_t DoReadMemory(lldb::addr_t addr, void *buf, size_t size, lldb_private::Error &error) override; - virtual lldb::addr_t - GetImageInfoAddress () override; + lldb::addr_t GetImageInfoAddress() override; lldb_private::ArchSpec GetArchitecture(); @@ -126,9 +114,8 @@ protected: void Clear ( ); - virtual bool - UpdateThreadList (lldb_private::ThreadList &old_thread_list, - lldb_private::ThreadList &new_thread_list) override; + bool UpdateThreadList(lldb_private::ThreadList &old_thread_list, + lldb_private::ThreadList &new_thread_list) override; private: //------------------------------------------------------------------ -- 2.34.1