Index: source/Plugins/JITLoader/GDB/JITLoaderGDB.h =================================================================== --- source/Plugins/JITLoader/GDB/JITLoaderGDB.h +++ source/Plugins/JITLoader/GDB/JITLoaderGDB.h @@ -42,29 +42,28 @@ JITLoaderGDB (lldb_private::Process *process); - virtual - ~JITLoaderGDB (); + ~JITLoaderGDB() override; //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual lldb_private::ConstString - GetPluginName(); + lldb_private::ConstString + GetPluginName() override; - virtual uint32_t - GetPluginVersion(); + uint32_t + GetPluginVersion() override; //------------------------------------------------------------------ // JITLoader interface //------------------------------------------------------------------ - virtual void - DidAttach (); + void + DidAttach() override; - virtual void - DidLaunch (); + void + DidLaunch() override; - virtual void - ModulesDidLoad (lldb_private::ModuleList &module_list); + void + ModulesDidLoad(lldb_private::ModuleList &module_list) override; private: lldb::addr_t @@ -98,11 +97,10 @@ // A collection of in-memory jitted object addresses and their corresponding modules typedef std::map JITObjectMap; - JITObjectMap m_jit_objects; + JITObjectMap m_jit_objects; lldb::user_id_t m_jit_break_id; lldb::addr_t m_jit_descriptor_addr; - }; -#endif +#endif // liblldb_JITLoaderGDB_h_ Index: source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h =================================================================== --- source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h +++ source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h @@ -116,12 +116,12 @@ bool m_parse_error; }; - virtual ~CPlusPlusLanguage() = default; + ~CPlusPlusLanguage() override = default; CPlusPlusLanguage () = default; lldb::LanguageType - GetLanguageType () const + GetLanguageType() const override { return lldb::eLanguageTypeC_plus_plus; } @@ -162,17 +162,16 @@ static uint32_t FindEquivalentNames(ConstString type_name, std::vector& equivalents); - //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual ConstString - GetPluginName(); + ConstString + GetPluginName() override; - virtual uint32_t - GetPluginVersion(); + uint32_t + GetPluginVersion() override; }; } // namespace lldb_private -#endif // liblldb_CPlusPlusLanguage_h_ +#endif // liblldb_CPlusPlusLanguage_h_ Index: source/Plugins/Language/ObjC/ObjCLanguage.h =================================================================== --- source/Plugins/Language/ObjC/ObjCLanguage.h +++ source/Plugins/Language/ObjC/ObjCLanguage.h @@ -119,6 +119,7 @@ // names[3] => "-[NSString myStringWithCString:]" size_t GetFullNames (std::vector &names, bool append); + protected: ConstString m_full; // Full name: "+[NSString(my_additions) myStringWithCString:]" ConstString m_class; // Class name: "NSString" @@ -127,15 +128,14 @@ ConstString m_selector; // Selector: "myStringWithCString:" Type m_type; bool m_category_is_valid; - }; - virtual ~ObjCLanguage() = default; + ~ObjCLanguage() override = default; ObjCLanguage () = default; lldb::LanguageType - GetLanguageType () const + GetLanguageType() const override { return lldb::eLanguageTypeObjC; } @@ -182,13 +182,13 @@ //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual ConstString - GetPluginName(); + ConstString + GetPluginName() override; - virtual uint32_t - GetPluginVersion(); + uint32_t + GetPluginVersion() override; }; } // namespace lldb_private -#endif // liblldb_ObjCLanguage_h_ +#endif // liblldb_ObjCLanguage_h_ Index: source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h =================================================================== --- source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h +++ source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h @@ -23,12 +23,12 @@ public Language { public: - virtual ~ObjCPlusPlusLanguage() = default; - ObjCPlusPlusLanguage () = default; - + + ~ObjCPlusPlusLanguage() override = default; + lldb::LanguageType - GetLanguageType () const + GetLanguageType() const override { return lldb::eLanguageTypeObjC_plus_plus; } @@ -51,13 +51,13 @@ //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual ConstString - GetPluginName(); + ConstString + GetPluginName() override; - virtual uint32_t - GetPluginVersion(); + uint32_t + GetPluginVersion() override; }; } // namespace lldb_private -#endif // liblldb_CPlusPlusLanguage_h_ +#endif // liblldb_ObjCPlusPlusLanguage_h_ Index: source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h =================================================================== --- source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h +++ source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h @@ -29,19 +29,19 @@ public lldb_private::CPPLanguageRuntime { public: - ~ItaniumABILanguageRuntime() { } + ~ItaniumABILanguageRuntime() override = default; - virtual bool - IsVTableName (const char *name); + bool + IsVTableName(const char *name) override; - virtual bool - GetDynamicTypeAndAddress (ValueObject &in_value, - lldb::DynamicValueType use_dynamic, - TypeAndOrName &class_type_or_name, - Address &address); + bool + GetDynamicTypeAndAddress(ValueObject &in_value, + lldb::DynamicValueType use_dynamic, + TypeAndOrName &class_type_or_name, + Address &address) override; - virtual bool - CouldHaveDynamicValue (ValueObject &in_value); + bool + CouldHaveDynamicValue(ValueObject &in_value) override; //------------------------------------------------------------------ // Static Functions @@ -61,32 +61,32 @@ //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual lldb_private::ConstString - GetPluginName(); + lldb_private::ConstString + GetPluginName() override; - virtual uint32_t - GetPluginVersion(); + uint32_t + GetPluginVersion() override; - virtual void - SetExceptionBreakpoints (); + void + SetExceptionBreakpoints() override; - virtual void - ClearExceptionBreakpoints (); + void + ClearExceptionBreakpoints() override; - virtual bool - ExceptionBreakpointsAreSet (); + bool + ExceptionBreakpointsAreSet() override; - virtual bool - ExceptionBreakpointsExplainStop (lldb::StopInfoSP stop_reason); + bool + ExceptionBreakpointsExplainStop(lldb::StopInfoSP stop_reason) override; - virtual lldb::BreakpointResolverSP - CreateExceptionResolver (Breakpoint *bkpt, bool catch_bp, bool throw_bp); + lldb::BreakpointResolverSP + CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bool throw_bp) override; - virtual lldb::SearchFilterSP - CreateExceptionSearchFilter (); + lldb::SearchFilterSP + CreateExceptionSearchFilter() override; - virtual size_t - GetAlternateManglings(const ConstString &mangled, std::vector &alternates); + size_t + GetAlternateManglings(const ConstString &mangled, std::vector &alternates) override; protected: @@ -107,4 +107,4 @@ } // namespace lldb_private -#endif // liblldb_ItaniumABILanguageRuntime_h_ +#endif // liblldb_ItaniumABILanguageRuntime_h_ Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h =================================================================== --- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h +++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h @@ -30,9 +30,8 @@ public lldb_private::ObjCLanguageRuntime { public: - - virtual ~AppleObjCRuntime() { } - + ~AppleObjCRuntime() override = default; + // These are generic runtime functions: bool GetObjectDescription (Stream &str, Value &value, ExecutionContextScope *exe_scope) override; @@ -99,6 +98,7 @@ //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ + public: void SetExceptionBreakpoints() override; @@ -136,4 +136,4 @@ } // namespace lldb_private -#endif // liblldb_AppleObjCRuntime_h_ +#endif // liblldb_AppleObjCRuntime_h_ Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h =================================================================== --- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h +++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h @@ -30,56 +30,54 @@ public: ClassDescriptorV1 (ValueObject &isa_pointer); ClassDescriptorV1 (ObjCISA isa, lldb::ProcessSP process_sp); - - virtual ConstString - GetClassName () + + ~ClassDescriptorV1() override = default; + + ConstString + GetClassName() override { return m_name; } - virtual ClassDescriptorSP - GetSuperclass (); + ClassDescriptorSP + GetSuperclass() override; - virtual ClassDescriptorSP - GetMetaclass () const; + ClassDescriptorSP + GetMetaclass() const override; - virtual bool - IsValid () + bool + IsValid() override { return m_valid; } // v1 does not support tagged pointers - virtual bool - GetTaggedPointerInfo (uint64_t* info_bits = NULL, - uint64_t* value_bits = NULL, - uint64_t* payload = NULL) + bool + GetTaggedPointerInfo(uint64_t* info_bits = NULL, + uint64_t* value_bits = NULL, + uint64_t* payload = NULL) override { return false; } - virtual uint64_t - GetInstanceSize () + uint64_t + GetInstanceSize() override { return m_instance_size; } - virtual ObjCISA - GetISA () + ObjCISA + GetISA() override { return m_isa; } - virtual bool - Describe (std::function const &superclass_func, - std::function const &instance_method_func, - std::function const &class_method_func, - std::function const &ivar_func) const; + bool + Describe(std::function const &superclass_func, + std::function const &instance_method_func, + std::function const &class_method_func, + std::function const &ivar_func) const override; - virtual - ~ClassDescriptorV1 () - {} - protected: void Initialize (ObjCISA isa, lldb::ProcessSP process_sp); @@ -93,17 +91,17 @@ uint64_t m_instance_size; }; - virtual ~AppleObjCRuntimeV1() { } + ~AppleObjCRuntimeV1() override = default; // These are generic runtime functions: - virtual bool - GetDynamicTypeAndAddress (ValueObject &in_value, - lldb::DynamicValueType use_dynamic, - TypeAndOrName &class_type_or_name, - Address &address); + bool + GetDynamicTypeAndAddress(ValueObject &in_value, + lldb::DynamicValueType use_dynamic, + TypeAndOrName &class_type_or_name, + Address &address) override; - virtual ClangUtilityFunction * - CreateObjectChecker (const char *); + ClangUtilityFunction * + CreateObjectChecker(const char *) override; //------------------------------------------------------------------ // Static Functions @@ -123,29 +121,28 @@ //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual ConstString - GetPluginName(); + ConstString + GetPluginName() override; - virtual uint32_t - GetPluginVersion(); + uint32_t + GetPluginVersion() override; - virtual ObjCRuntimeVersions - GetRuntimeVersion () + ObjCRuntimeVersions + GetRuntimeVersion() override { return eAppleObjC_V1; } - virtual void - UpdateISAToDescriptorMapIfNeeded(); + void + UpdateISAToDescriptorMapIfNeeded() override; - virtual DeclVendor * - GetDeclVendor(); + DeclVendor * + GetDeclVendor() override; protected: - virtual lldb::BreakpointResolverSP - CreateExceptionResolver (Breakpoint *bkpt, bool catch_bp, bool throw_bp); + lldb::BreakpointResolverSP + CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bool throw_bp) override; - class HashTableSignature { public: @@ -189,10 +186,11 @@ HashTableSignature m_hash_signature; lldb::addr_t m_isa_hash_table_ptr; std::unique_ptr m_decl_vendor_ap; + private: AppleObjCRuntimeV1(Process *process); }; } // namespace lldb_private -#endif // liblldb_AppleObjCRuntimeV1_h_ +#endif // liblldb_AppleObjCRuntimeV1_h_ Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h =================================================================== --- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h +++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h @@ -30,19 +30,18 @@ public AppleObjCRuntime { public: - virtual ~AppleObjCRuntimeV2(); + ~AppleObjCRuntimeV2() override; // These are generic runtime functions: - virtual bool - GetDynamicTypeAndAddress (ValueObject &in_value, - lldb::DynamicValueType use_dynamic, - TypeAndOrName &class_type_or_name, - Address &address); + bool + GetDynamicTypeAndAddress(ValueObject &in_value, + lldb::DynamicValueType use_dynamic, + TypeAndOrName &class_type_or_name, + Address &address) override; - virtual ClangUtilityFunction * - CreateObjectChecker (const char *); + ClangUtilityFunction * + CreateObjectChecker(const char *) override; - //------------------------------------------------------------------ // Static Functions //------------------------------------------------------------------ @@ -61,23 +60,23 @@ //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual ConstString - GetPluginName(); + ConstString + GetPluginName() override; - virtual uint32_t - GetPluginVersion(); + uint32_t + GetPluginVersion() override; - virtual ObjCRuntimeVersions - GetRuntimeVersion () + ObjCRuntimeVersions + GetRuntimeVersion() override { return eAppleObjC_V2; } - virtual size_t - GetByteOffsetForIvar (CompilerType &parent_qual_type, const char *ivar_name); + size_t + GetByteOffsetForIvar(CompilerType &parent_qual_type, const char *ivar_name) override; - virtual void - UpdateISAToDescriptorMapIfNeeded(); + void + UpdateISAToDescriptorMapIfNeeded() override; // none of these are valid ISAs - we use them to infer the type // of tagged pointers - if we have something meaningful to say @@ -90,33 +89,33 @@ static const ObjCLanguageRuntime::ObjCISA g_objc_Tagged_ISA_NSManagedObject = 5; static const ObjCLanguageRuntime::ObjCISA g_objc_Tagged_ISA_NSDate = 6; - virtual ConstString - GetActualTypeName(ObjCLanguageRuntime::ObjCISA isa); + ConstString + GetActualTypeName(ObjCLanguageRuntime::ObjCISA isa) override; - virtual ClassDescriptorSP - GetClassDescriptor (ValueObject& in_value); + ClassDescriptorSP + GetClassDescriptor(ValueObject& in_value) override; - virtual ClassDescriptorSP - GetClassDescriptorFromISA (ObjCISA isa); + ClassDescriptorSP + GetClassDescriptorFromISA(ObjCISA isa) override; - virtual DeclVendor * - GetDeclVendor(); + DeclVendor * + GetDeclVendor() override; - virtual lldb::addr_t - LookupRuntimeSymbol (const ConstString &name); + lldb::addr_t + LookupRuntimeSymbol(const ConstString &name) override; - virtual EncodingToTypeSP - GetEncodingToType (); + EncodingToTypeSP + GetEncodingToType() override; - virtual TaggedPointerVendor* - GetTaggedPointerVendor () + TaggedPointerVendor* + GetTaggedPointerVendor() override { return m_tagged_pointer_vendor_ap.get(); } protected: - virtual lldb::BreakpointResolverSP - CreateExceptionResolver (Breakpoint *bkpt, bool catch_bp, bool throw_bp); + lldb::BreakpointResolverSP + CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bool throw_bp) override; private: @@ -132,6 +131,7 @@ void UpdateSignature (const RemoteNXMapTable &hash_table); + protected: uint32_t m_count; uint32_t m_num_buckets; @@ -148,6 +148,7 @@ ObjCLanguageRuntime::ClassDescriptorSP GetClassDescriptor (ObjCISA isa); + private: NonPointerISACache (AppleObjCRuntimeV2& runtime, uint64_t objc_debug_isa_class_mask, @@ -175,8 +176,8 @@ CreateInstance (AppleObjCRuntimeV2& runtime, const lldb::ModuleSP& objc_module_sp); - virtual - ~TaggedPointerVendorV2 () { } + ~TaggedPointerVendorV2() override = default; + protected: AppleObjCRuntimeV2& m_runtime; @@ -185,19 +186,20 @@ m_runtime(runtime) { } + private: - DISALLOW_COPY_AND_ASSIGN(TaggedPointerVendorV2); }; class TaggedPointerVendorRuntimeAssisted : public TaggedPointerVendorV2 { public: - virtual bool - IsPossibleTaggedPointer (lldb::addr_t ptr); + bool + IsPossibleTaggedPointer(lldb::addr_t ptr) override; - virtual ObjCLanguageRuntime::ClassDescriptorSP - GetClassDescriptor (lldb::addr_t ptr); + ObjCLanguageRuntime::ClassDescriptorSP + GetClassDescriptor(lldb::addr_t ptr) override; + protected: TaggedPointerVendorRuntimeAssisted (AppleObjCRuntimeV2& runtime, uint64_t objc_debug_taggedpointer_mask, @@ -225,11 +227,12 @@ class TaggedPointerVendorLegacy : public TaggedPointerVendorV2 { public: - virtual bool - IsPossibleTaggedPointer (lldb::addr_t ptr); + bool + IsPossibleTaggedPointer(lldb::addr_t ptr) override; - virtual ObjCLanguageRuntime::ClassDescriptorSP - GetClassDescriptor (lldb::addr_t ptr); + ObjCLanguageRuntime::ClassDescriptorSP + GetClassDescriptor(lldb::addr_t ptr) override; + protected: TaggedPointerVendorLegacy (AppleObjCRuntimeV2& runtime) : TaggedPointerVendorV2 (runtime) @@ -322,4 +325,4 @@ } // namespace lldb_private -#endif // liblldb_AppleObjCRuntimeV2_h_ +#endif // liblldb_AppleObjCRuntimeV2_h_ Index: source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h =================================================================== --- source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h +++ source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h @@ -36,49 +36,47 @@ lldb::addr_t sel_addr, bool stop_others); - virtual ~AppleThreadPlanStepThroughObjCTrampoline(); + ~AppleThreadPlanStepThroughObjCTrampoline() override; - virtual void - GetDescription (Stream *s, - lldb::DescriptionLevel level); + void + GetDescription(Stream *s, + lldb::DescriptionLevel level) override; - virtual bool - ValidatePlan (Stream *error); + bool + ValidatePlan(Stream *error) override; - virtual lldb::StateType - GetPlanRunState (); + lldb::StateType + GetPlanRunState() override; - virtual bool - ShouldStop (Event *event_ptr); + bool + ShouldStop(Event *event_ptr) override; - virtual bool - StopOthers() + bool + StopOthers() override { return m_stop_others; } // The base class MischiefManaged does some cleanup - so you have to call it // in your MischiefManaged derived class. - virtual bool - MischiefManaged (); + bool + MischiefManaged() override; - virtual void - DidPush(); + void + DidPush() override; static bool PreResumeInitializeClangFunction(void *myself); - virtual bool - WillStop(); + bool + WillStop() override; - - protected: //------------------------------------------------------------------ // Classes that inherit from AppleThreadPlanStepThroughObjCTrampoline can see and modify these //------------------------------------------------------------------ - virtual bool - DoPlanExplainsStop (Event *event_ptr); + bool + DoPlanExplainsStop(Event *event_ptr) override; private: bool @@ -103,4 +101,4 @@ } // namespace lldb_private -#endif // lldb_AppleThreadPlanStepThroughObjCTrampoline_h_ +#endif // lldb_AppleThreadPlanStepThroughObjCTrampoline_h_ Index: source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h =================================================================== --- source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h +++ source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h @@ -21,7 +21,6 @@ namespace lldb_private { - typedef uint32_t RSSlot; class RSModuleDescriptor; struct RSGlobalDescriptor; @@ -31,8 +30,6 @@ typedef std::shared_ptr RSGlobalDescriptorSP; typedef std::shared_ptr RSKernelDescriptorSP; - - struct RSKernelDescriptor { public: @@ -99,9 +96,8 @@ eModuleKindKernelObj }; + ~RenderScriptRuntime() override = default; - ~RenderScriptRuntime() {} - //------------------------------------------------------------------ // Static Functions //------------------------------------------------------------------ @@ -124,18 +120,18 @@ //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual lldb_private::ConstString GetPluginName(); + lldb_private::ConstString GetPluginName() override; - virtual uint32_t GetPluginVersion(); + uint32_t GetPluginVersion() override; - virtual bool IsVTableName(const char *name); + bool IsVTableName(const char *name) override; - virtual bool GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic, - TypeAndOrName &class_type_or_name, Address &address); + bool GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic, + TypeAndOrName &class_type_or_name, Address &address) override; - virtual bool CouldHaveDynamicValue(ValueObject &in_value); + bool CouldHaveDynamicValue(ValueObject &in_value) override; - virtual lldb::BreakpointResolverSP CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bool throw_bp); + lldb::BreakpointResolverSP CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bool throw_bp) override; bool LoadModule(const lldb::ModuleSP &module_sp); @@ -151,11 +147,11 @@ void Status(Stream &strm) const; - virtual size_t GetAlternateManglings(const ConstString &mangled, std::vector &alternates) { + size_t GetAlternateManglings(const ConstString &mangled, std::vector &alternates) override { return static_cast(0); } - virtual void ModulesDidLoad(const ModuleList &module_list ); + void ModulesDidLoad(const ModuleList &module_list ) override; void Update(); @@ -224,7 +220,6 @@ void CaptureScriptInit1(RuntimeHook* hook_info, ExecutionContext& context); void CaptureAllocationInit1(RuntimeHook* hook_info, ExecutionContext& context); void CaptureSetGlobalVar1(RuntimeHook* hook_info, ExecutionContext& context); - }; } // namespace lldb_private Index: source/Plugins/Process/Utility/UnwindLLDB.h =================================================================== --- source/Plugins/Process/Utility/UnwindLLDB.h +++ source/Plugins/Process/Utility/UnwindLLDB.h @@ -28,8 +28,7 @@ public: UnwindLLDB (lldb_private::Thread &thread); - virtual - ~UnwindLLDB() { } + ~UnwindLLDB() override = default; enum RegisterSearchResult { @@ -62,23 +61,23 @@ }; void - DoClear() + DoClear() override { m_frames.clear(); m_candidate_frame.reset(); m_unwind_complete = false; } - virtual uint32_t - DoGetFrameCount(); + uint32_t + DoGetFrameCount() override; bool - DoGetFrameInfoAtIndex (uint32_t frame_idx, - lldb::addr_t& cfa, - lldb::addr_t& start_pc); + DoGetFrameInfoAtIndex(uint32_t frame_idx, + lldb::addr_t& cfa, + lldb::addr_t& start_pc) override; lldb::RegisterContextSP - DoCreateRegisterContextForFrame (lldb_private::StackFrame *frame); + DoCreateRegisterContextForFrame(lldb_private::StackFrame *frame) override; typedef std::shared_ptr RegisterContextLLDBSP; @@ -92,7 +91,6 @@ bool SearchForSavedLocationForRegister (uint32_t lldb_regnum, lldb_private::UnwindLLDB::RegisterLocation ®loc, uint32_t starting_frame_num, bool pc_register); - //------------------------------------------------------------------ /// Provide the list of user-specified trap handler functions /// @@ -121,6 +119,7 @@ RegisterContextLLDBSP reg_ctx_lldb_sp; // These are all RegisterContextLLDB's Cursor () : start_pc (LLDB_INVALID_ADDRESS), cfa (LLDB_INVALID_ADDRESS), sctx(), reg_ctx_lldb_sp() { } + private: DISALLOW_COPY_AND_ASSIGN (Cursor); }; @@ -149,6 +148,6 @@ DISALLOW_COPY_AND_ASSIGN (UnwindLLDB); }; -} // namespace lldb_private +} // namespace lldb_private -#endif // lldb_UnwindLLDB_h_ +#endif // lldb_UnwindLLDB_h_ Index: source/Plugins/Process/Utility/UnwindMacOSXFrameBackchain.h =================================================================== --- source/Plugins/Process/Utility/UnwindMacOSXFrameBackchain.h +++ source/Plugins/Process/Utility/UnwindMacOSXFrameBackchain.h @@ -25,28 +25,25 @@ public: UnwindMacOSXFrameBackchain (lldb_private::Thread &thread); - virtual - ~UnwindMacOSXFrameBackchain() - { - } - + ~UnwindMacOSXFrameBackchain() override = default; + protected: - virtual void - DoClear() + void + DoClear() override { m_cursors.clear(); } - virtual uint32_t - DoGetFrameCount(); + uint32_t + DoGetFrameCount() override; bool - DoGetFrameInfoAtIndex (uint32_t frame_idx, - lldb::addr_t& cfa, - lldb::addr_t& pc); + DoGetFrameInfoAtIndex(uint32_t frame_idx, + lldb::addr_t& cfa, + lldb::addr_t& pc) override; lldb::RegisterContextSP - DoCreateRegisterContextForFrame (lldb_private::StackFrame *frame); + DoCreateRegisterContextForFrame(lldb_private::StackFrame *frame) override; friend class RegisterContextMacOSXFrameBackchain; @@ -71,4 +68,4 @@ DISALLOW_COPY_AND_ASSIGN (UnwindMacOSXFrameBackchain); }; -#endif // lldb_UnwindMacOSXFrameBackchain_h_ +#endif // lldb_UnwindMacOSXFrameBackchain_h_ Index: source/Plugins/Process/elf-core/ProcessElfCore.h =================================================================== --- source/Plugins/Process/elf-core/ProcessElfCore.h +++ source/Plugins/Process/elf-core/ProcessElfCore.h @@ -60,8 +60,7 @@ lldb_private::Listener &listener, const lldb_private::FileSpec &core_file); - virtual - ~ProcessElfCore(); + ~ProcessElfCore() override; //------------------------------------------------------------------ // Check if a given Process @@ -157,4 +156,4 @@ AddAddressRangeFromLoadSegment(const elf::ELFProgramHeader *header); }; -#endif // liblldb_ProcessElffCore_h_ +#endif // liblldb_ProcessElfCore_h_ Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h @@ -100,8 +100,7 @@ GDBRemoteCommunication(const char *comm_name, const char *listener_name); - virtual - ~GDBRemoteCommunication(); + ~GDBRemoteCommunication() override; PacketResult GetAck (); @@ -162,6 +161,7 @@ { return m_packet_timeout * TimeValue::MicroSecPerSec; } + //------------------------------------------------------------------ // Start a debugserver instance on the current host using the // supplied connection URL. @@ -275,7 +275,6 @@ return i % m_packets.size(); } - std::vector m_packets; uint32_t m_curr_idx; uint32_t m_total_packet_count; @@ -361,7 +360,7 @@ // This method is defined as part of communication.h // when the read thread gets any bytes it will pass them on to this function - virtual void AppendBytesToCache (const uint8_t * bytes, size_t len, bool broadcast, lldb::ConnectionStatus status); + void AppendBytesToCache(const uint8_t * bytes, size_t len, bool broadcast, lldb::ConnectionStatus status) override; private: @@ -381,4 +380,4 @@ } // namespace process_gdb_remote } // namespace lldb_private -#endif // liblldb_GDBRemoteCommunication_h_ +#endif // liblldb_GDBRemoteCommunication_h_ Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h @@ -33,7 +33,7 @@ //------------------------------------------------------------------ GDBRemoteCommunicationClient(); - ~GDBRemoteCommunicationClient(); + ~GDBRemoteCommunicationClient() override; //------------------------------------------------------------------ // After connecting, send the handshake to the server to make sure @@ -182,7 +182,6 @@ SendAttach (lldb::pid_t pid, StringExtractorGDBRemote& response); - //------------------------------------------------------------------ /// Sends a GDB remote protocol 'I' packet that delivers stdin /// data to the remote process. @@ -639,7 +638,6 @@ lldb::tid_t m_curr_tid; // Current gdb remote protocol thread index for all other operations lldb::tid_t m_curr_tid_run; // Current gdb remote protocol thread index for continue, step, etc - uint32_t m_num_supported_hardware_watchpoints; // If we need to send a packet while the target is running, the m_async_XXX @@ -667,7 +665,6 @@ uint32_t m_default_packet_timeout; uint64_t m_max_packet_size; // as returned by qSupported - bool DecodeProcessInfoResponse (StringExtractorGDBRemote &response, ProcessInstanceInfo &process_info); @@ -681,4 +678,4 @@ } // namespace process_gdb_remote } // namespace lldb_private -#endif // liblldb_GDBRemoteCommunicationClient_h_ +#endif // liblldb_GDBRemoteCommunicationClient_h_ Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h @@ -39,8 +39,7 @@ GDBRemoteCommunicationServer(const char *comm_name, const char *listener_name); - virtual - ~GDBRemoteCommunicationServer(); + ~GDBRemoteCommunicationServer() override; void RegisterPacketHandler(StringExtractorGDBRemote::ServerPacketType packet_type, PacketHandler handler); @@ -82,4 +81,4 @@ } // namespace process_gdb_remote } // namespace lldb_private -#endif // liblldb_GDBRemoteCommunicationServer_h_ +#endif // liblldb_GDBRemoteCommunicationServer_h_ Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.h =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.h +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.h @@ -35,8 +35,7 @@ public: GDBRemoteCommunicationServerCommon(const char *comm_name, const char *listener_name); - virtual - ~GDBRemoteCommunicationServerCommon(); + ~GDBRemoteCommunicationServerCommon() override; protected: ProcessLaunchInfo m_process_launch_info; @@ -204,4 +203,4 @@ } // namespace process_gdb_remote } // namespace lldb_private -#endif // liblldb_GDBRemoteCommunicationServerCommon_h_ +#endif // liblldb_GDBRemoteCommunicationServerCommon_h_ Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h @@ -25,8 +25,7 @@ GDBRemoteCommunicationServerPlatform(); - virtual - ~GDBRemoteCommunicationServerPlatform(); + ~GDBRemoteCommunicationServerPlatform() override; Error LaunchProcess () override; @@ -112,4 +111,4 @@ } // namespace process_gdb_remote } // namespace lldb_private -#endif // liblldb_GDBRemoteCommunicationServerPlatform_h_ +#endif // liblldb_GDBRemoteCommunicationServerPlatform_h_ Index: source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h +++ source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h @@ -42,13 +42,10 @@ { } - ~GDBRemoteDynamicRegisterInfo () - { - } + ~GDBRemoteDynamicRegisterInfo() override = default; void HardcodeARMRegisters(bool from_scratch); - }; class GDBRemoteRegisterContext : public RegisterContext @@ -62,8 +59,7 @@ GDBRemoteDynamicRegisterInfo ®_info, bool read_all_at_once); - virtual - ~GDBRemoteRegisterContext (); + ~GDBRemoteRegisterContext() override; //------------------------------------------------------------------ // Subclasses must override these functions @@ -175,4 +171,4 @@ } // namespace process_gdb_remote } // namespace lldb_private -#endif // lldb_GDBRemoteRegisterContext_h_ +#endif // lldb_GDBRemoteRegisterContext_h_ Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.h =================================================================== --- source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -70,8 +70,7 @@ //------------------------------------------------------------------ ProcessGDBRemote(lldb::TargetSP target_sp, Listener &listener); - virtual - ~ProcessGDBRemote(); + ~ProcessGDBRemote() override; //------------------------------------------------------------------ // Check if a given Process @@ -277,6 +276,7 @@ { return state == lldb::eStateStepping; } + bool CanResume ( lldb::StateType state) { @@ -468,10 +468,9 @@ lldb::user_id_t break_loc_id); DISALLOW_COPY_AND_ASSIGN (ProcessGDBRemote); - }; } // namespace process_gdb_remote } // namespace lldb_private -#endif // liblldb_ProcessGDBRemote_h_ +#endif // liblldb_ProcessGDBRemote_h_