Index: lldb/trunk/include/lldb/Target/InstrumentationRuntimeStopInfo.h =================================================================== --- lldb/trunk/include/lldb/Target/InstrumentationRuntimeStopInfo.h +++ lldb/trunk/include/lldb/Target/InstrumentationRuntimeStopInfo.h @@ -25,21 +25,21 @@ { public: - virtual ~InstrumentationRuntimeStopInfo() + ~InstrumentationRuntimeStopInfo() override { } - virtual lldb::StopReason - GetStopReason () const + lldb::StopReason + GetStopReason() const override { return lldb::eStopReasonInstrumentation; } - virtual const char * - GetDescription (); + const char * + GetDescription() override; - virtual bool - DoShouldNotify (Event *event_ptr) + bool + DoShouldNotify(Event *event_ptr) override { return true; } @@ -50,9 +50,8 @@ private: InstrumentationRuntimeStopInfo(Thread &thread, std::string description, StructuredData::ObjectSP additional_data); - }; } // namespace lldb_private -#endif // liblldb_InstrumentationRuntimeStopInfo_h_ +#endif // liblldb_InstrumentationRuntimeStopInfo_h_ Index: lldb/trunk/include/lldb/Target/JITLoader.h =================================================================== --- lldb/trunk/include/lldb/Target/JITLoader.h +++ lldb/trunk/include/lldb/Target/JITLoader.h @@ -50,8 +50,7 @@ //------------------------------------------------------------------ JITLoader (Process *process); - virtual - ~JITLoader (); + ~JITLoader() override; //------------------------------------------------------------------ /// Called after attaching a process. Index: lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h =================================================================== --- lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h +++ lldb/trunk/include/lldb/Target/ObjCLanguageRuntime.h @@ -194,7 +194,7 @@ public: ObjCExceptionPrecondition(); - virtual ~ObjCExceptionPrecondition() {} + ~ObjCExceptionPrecondition() override {} bool EvaluatePrecondition(StoppointCallbackContext &context) override; void DescribePrecondition(Stream &stream, lldb::DescriptionLevel level) override; @@ -251,8 +251,7 @@ ClassDescriptorSP GetNonKVOClassDescriptor (ObjCISA isa); - virtual - ~ObjCLanguageRuntime(); + ~ObjCLanguageRuntime() override; lldb::LanguageType GetLanguageType () const override @@ -383,7 +382,6 @@ return false; } - bool ISAIsCached (ObjCISA isa) const { @@ -430,11 +428,13 @@ sel_addr = LLDB_INVALID_ADDRESS; class_addr = LLDB_INVALID_ADDRESS; } + ClassAndSel (lldb::addr_t in_sel_addr, lldb::addr_t in_class_addr) : class_addr (in_class_addr), sel_addr(in_sel_addr) { } + bool operator== (const ClassAndSel &rhs) { if (class_addr == rhs.class_addr @@ -511,4 +511,4 @@ } // namespace lldb_private -#endif // liblldb_ObjCLanguageRuntime_h_ +#endif // liblldb_ObjCLanguageRuntime_h_ Index: lldb/trunk/include/lldb/Target/RegisterContext.h =================================================================== --- lldb/trunk/include/lldb/Target/RegisterContext.h +++ lldb/trunk/include/lldb/Target/RegisterContext.h @@ -29,8 +29,7 @@ //------------------------------------------------------------------ RegisterContext (Thread &thread, uint32_t concrete_frame_idx); - virtual - ~RegisterContext (); + ~RegisterContext() override; void InvalidateIfNeeded (bool force); @@ -213,26 +212,27 @@ bool WriteRegisterFromUnsigned (const RegisterInfo *reg_info, uint64_t uval); + bool ConvertBetweenRegisterKinds (lldb::RegisterKind source_rk, uint32_t source_regnum, lldb::RegisterKind target_rk, uint32_t& target_regnum); //------------------------------------------------------------------ // lldb::ExecutionContextScope pure virtual functions //------------------------------------------------------------------ - virtual lldb::TargetSP - CalculateTarget (); + lldb::TargetSP + CalculateTarget() override; - virtual lldb::ProcessSP - CalculateProcess (); + lldb::ProcessSP + CalculateProcess() override; - virtual lldb::ThreadSP - CalculateThread (); + lldb::ThreadSP + CalculateThread() override; - virtual lldb::StackFrameSP - CalculateStackFrame (); + lldb::StackFrameSP + CalculateStackFrame() override; - virtual void - CalculateExecutionContext (ExecutionContext &exe_ctx); + void + CalculateExecutionContext(ExecutionContext &exe_ctx) override; uint32_t GetStopID () const @@ -262,4 +262,4 @@ } // namespace lldb_private -#endif // liblldb_RegisterContext_h_ +#endif // liblldb_RegisterContext_h_ Index: lldb/trunk/include/lldb/Target/Target.h =================================================================== --- lldb/trunk/include/lldb/Target/Target.h +++ lldb/trunk/include/lldb/Target/Target.h @@ -55,8 +55,7 @@ public: TargetProperties(Target *target); - virtual - ~TargetProperties(); + ~TargetProperties() override; ArchSpec GetDefaultArchitecture () const; @@ -530,7 +529,7 @@ static ConstString &GetStaticBroadcasterClass (); - virtual ConstString &GetBroadcasterClass() const + ConstString &GetBroadcasterClass() const override { return GetStaticBroadcasterClass(); } @@ -543,20 +542,19 @@ TargetEventData (const lldb::TargetSP &target_sp, const ModuleList &module_list); - virtual - ~TargetEventData(); + ~TargetEventData() override; static const ConstString & GetFlavorString (); - virtual const ConstString & - GetFlavor () const + const ConstString & + GetFlavor() const override { return TargetEventData::GetFlavorString (); } - virtual void - Dump (Stream *s) const; + void + Dump(Stream *s) const override; static const TargetEventData * GetEventDataFromEvent (const Event *event_ptr); @@ -621,7 +619,6 @@ static const lldb::TargetPropertiesSP & GetGlobalProperties(); - private: //------------------------------------------------------------------ /// Construct with optional file and arch. @@ -649,7 +646,7 @@ AddBreakpoint(lldb::BreakpointSP breakpoint_sp, bool internal); public: - ~Target(); + ~Target() override; Mutex & GetAPIMutex () @@ -811,7 +808,6 @@ bool internal, bool request_hardware); - // Use this to create a general breakpoint: lldb::BreakpointSP CreateBreakpoint (lldb::SearchFilterSP &filter_sp, @@ -933,18 +929,18 @@ /// Implementing of ModuleList::Notifier. //------------------------------------------------------------------ - virtual void - ModuleAdded (const ModuleList& module_list, const lldb::ModuleSP& module_sp); + void + ModuleAdded(const ModuleList& module_list, const lldb::ModuleSP& module_sp) override; - virtual void - ModuleRemoved (const ModuleList& module_list, const lldb::ModuleSP& module_sp); + void + ModuleRemoved(const ModuleList& module_list, const lldb::ModuleSP& module_sp) override; - virtual void - ModuleUpdated (const ModuleList& module_list, - const lldb::ModuleSP& old_module_sp, - const lldb::ModuleSP& new_module_sp); - virtual void - WillClearList (const ModuleList& module_list); + void + ModuleUpdated(const ModuleList& module_list, + const lldb::ModuleSP& old_module_sp, + const lldb::ModuleSP& new_module_sp) override; + void + WillClearList(const ModuleList& module_list) override; public: @@ -1213,20 +1209,20 @@ //------------------------------------------------------------------ // lldb::ExecutionContextScope pure virtual functions //------------------------------------------------------------------ - virtual lldb::TargetSP - CalculateTarget (); + lldb::TargetSP + CalculateTarget() override; - virtual lldb::ProcessSP - CalculateProcess (); + lldb::ProcessSP + CalculateProcess() override; - virtual lldb::ThreadSP - CalculateThread (); + lldb::ThreadSP + CalculateThread() override; - virtual lldb::StackFrameSP - CalculateStackFrame (); + lldb::StackFrameSP + CalculateStackFrame() override; - virtual void - CalculateExecutionContext (ExecutionContext &exe_ctx); + void + CalculateExecutionContext(ExecutionContext &exe_ctx) override; PathMappingList & GetImageSearchPathList (); @@ -1509,4 +1505,4 @@ } // namespace lldb_private -#endif // liblldb_Target_h_ +#endif // liblldb_Target_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlan.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlan.h +++ lldb/trunk/include/lldb/Target/ThreadPlan.h @@ -13,6 +13,7 @@ // C Includes // C++ Includes #include + // Other libraries and framework includes // Project includes #include "lldb/lldb-private.h" @@ -562,6 +563,7 @@ else return m_iteration_count; } + protected: //------------------------------------------------------------------ // Classes that inherit from ThreadPlan can see and modify these @@ -656,47 +658,46 @@ { public: ThreadPlanNull (Thread &thread); - virtual ~ThreadPlanNull (); + ~ThreadPlanNull() 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 bool - ShouldStop (Event *event_ptr); + bool + ShouldStop(Event *event_ptr) override; - virtual bool - MischiefManaged (); + bool + MischiefManaged() override; - virtual bool - WillStop (); + bool + WillStop() override; - virtual bool - IsBasePlan() + bool + IsBasePlan() override { return true; } - virtual bool - OkayToDiscard () + bool + OkayToDiscard() override { return false; } protected: - virtual bool - DoPlanExplainsStop (Event *event_ptr); + bool + DoPlanExplainsStop(Event *event_ptr) override; - virtual lldb::StateType - GetPlanRunState (); + lldb::StateType + GetPlanRunState() override; DISALLOW_COPY_AND_ASSIGN(ThreadPlanNull); }; - } // namespace lldb_private -#endif // liblldb_ThreadPlan_h_ +#endif // liblldb_ThreadPlan_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanBase.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanBase.h +++ lldb/trunk/include/lldb/Target/ThreadPlanBase.h @@ -31,31 +31,32 @@ { friend class Process; // RunThreadPlan manages "stopper" base plans. public: - virtual ~ThreadPlanBase (); + ~ThreadPlanBase() override; - virtual void GetDescription (Stream *s, lldb::DescriptionLevel level); - virtual bool ValidatePlan (Stream *error); - virtual bool ShouldStop (Event *event_ptr); - virtual Vote ShouldReportStop (Event *event_ptr); - virtual bool StopOthers (); - virtual lldb::StateType GetPlanRunState (); - virtual bool WillStop (); - virtual bool MischiefManaged (); + void GetDescription(Stream *s, lldb::DescriptionLevel level) override; + bool ValidatePlan(Stream *error) override; + bool ShouldStop(Event *event_ptr) override; + Vote ShouldReportStop(Event *event_ptr) override; + bool StopOthers() override; + lldb::StateType GetPlanRunState() override; + bool WillStop() override; + bool MischiefManaged() override; - virtual bool OkayToDiscard() + bool + OkayToDiscard() override { return false; } - virtual bool - IsBasePlan() + bool + IsBasePlan() override { return true; } protected: - virtual bool DoWillResume (lldb::StateType resume_state, bool current_plan); - virtual bool DoPlanExplainsStop (Event *event_ptr); + bool DoWillResume(lldb::StateType resume_state, bool current_plan) override; + bool DoPlanExplainsStop(Event *event_ptr) override; ThreadPlanBase (Thread &thread); private: @@ -65,7 +66,6 @@ DISALLOW_COPY_AND_ASSIGN (ThreadPlanBase); }; - } // namespace lldb_private -#endif // liblldb_ThreadPlanFundamental_h_ +#endif // liblldb_ThreadPlanFundamental_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h +++ lldb/trunk/include/lldb/Target/ThreadPlanCallFunction.h @@ -38,35 +38,34 @@ const Address &function, const EvaluateExpressionOptions &options); - virtual - ~ThreadPlanCallFunction (); + ~ThreadPlanCallFunction() 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 bool - ShouldStop (Event *event_ptr); + bool + ShouldStop(Event *event_ptr) override; - virtual Vote - ShouldReportStop(Event *event_ptr); + Vote + ShouldReportStop(Event *event_ptr) override; - virtual bool - StopOthers (); + bool + StopOthers() override; - virtual lldb::StateType - GetPlanRunState (); + lldb::StateType + GetPlanRunState() override; - virtual void - DidPush (); + void + DidPush() override; - virtual bool - WillStop (); + bool + WillStop() override; - virtual bool - MischiefManaged (); + bool + MischiefManaged() override; // To get the return value from a function call you must create a // lldb::ValueSP that contains a valid clang type in its context and call @@ -77,8 +76,8 @@ // plan is complete, you can call "GetReturnValue()" to retrieve the value // that was extracted. - virtual lldb::ValueObjectSP - GetReturnValueObject () + lldb::ValueObjectSP + GetReturnValueObject() override { return m_return_valobj_sp; } @@ -96,8 +95,8 @@ // Classes that derive from ClangFunction, and implement // their own WillPop methods should call this so that the // thread state gets restored if the plan gets discarded. - virtual void - WillPop (); + void + WillPop() override; // If the thread plan stops mid-course, this will be the stop reason that interrupted us. // Once DoTakedown is called, this will be the real stop reason at the end of the function call. @@ -105,8 +104,8 @@ // This is needed because we want the CallFunction thread plans not to show up as the stop reason. // But if something bad goes wrong, it is nice to be able to tell the user what really happened. - virtual lldb::StopInfoSP - GetRealStopInfo() + lldb::StopInfoSP + GetRealStopInfo() override { if (m_real_stop_info_sp) return m_real_stop_info_sp; @@ -120,23 +119,23 @@ return m_stop_address; } - virtual bool - RestoreThreadState(); + bool + RestoreThreadState() override; - virtual void - ThreadDestroyed () + void + ThreadDestroyed() override { m_takedown_done = true; } - virtual void - SetStopOthers (bool new_value); + void + SetStopOthers(bool new_value) override; protected: void ReportRegisterState (const char *message); - virtual bool - DoPlanExplainsStop (Event *event_ptr); + bool + DoPlanExplainsStop(Event *event_ptr) override; virtual void SetReturnValue(); @@ -190,4 +189,4 @@ } // namespace lldb_private -#endif // liblldb_ThreadPlanCallFunction_h_ +#endif // liblldb_ThreadPlanCallFunction_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h +++ lldb/trunk/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h @@ -38,7 +38,7 @@ llvm::ArrayRef args, const EvaluateExpressionOptions &options); - ~ThreadPlanCallFunctionUsingABI (); + ~ThreadPlanCallFunctionUsingABI() override; void GetDescription (Stream *s, lldb::DescriptionLevel level) override; @@ -47,7 +47,6 @@ void SetReturnValue () override; - private: llvm::Type &m_return_type; DISALLOW_COPY_AND_ASSIGN (ThreadPlanCallFunctionUsingABI); @@ -55,4 +54,4 @@ } // namespace lldb_private -#endif // liblldb_ThreadPlanCallFunctionUsingABI_h_ +#endif // liblldb_ThreadPlanCallFunctionUsingABI_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanCallUserExpression.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanCallUserExpression.h +++ lldb/trunk/include/lldb/Target/ThreadPlanCallUserExpression.h @@ -32,20 +32,19 @@ const EvaluateExpressionOptions &options, lldb::ClangUserExpressionSP &user_expression_sp); - virtual - ~ThreadPlanCallUserExpression (); + ~ThreadPlanCallUserExpression() override; - virtual void - GetDescription (Stream *s, lldb::DescriptionLevel level); + void + GetDescription(Stream *s, lldb::DescriptionLevel level) override; - virtual void - WillPop (); + void + WillPop() override; - virtual lldb::StopInfoSP - GetRealStopInfo(); + lldb::StopInfoSP + GetRealStopInfo() override; - virtual bool - MischiefManaged (); + bool + MischiefManaged() override; void TransferExpressionOwnership () @@ -53,8 +52,8 @@ m_manage_materialization = true; } - virtual lldb::ClangExpressionVariableSP - GetExpressionVariable () + lldb::ClangExpressionVariableSP + GetExpressionVariable() override { return m_result_var_sp; } @@ -73,4 +72,4 @@ } // namespace lldb_private -#endif // liblldb_ThreadPlanCallUserExpression_h_ +#endif // liblldb_ThreadPlanCallUserExpression_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanPython.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanPython.h +++ lldb/trunk/include/lldb/Target/ThreadPlanPython.h @@ -13,6 +13,7 @@ // C Includes // C++ Includes #include + // Other libraries and framework includes // Project includes #include "lldb/lldb-private.h" @@ -37,45 +38,44 @@ { public: ThreadPlanPython (Thread &thread, const char *class_name); - virtual ~ThreadPlanPython (); + ~ThreadPlanPython() 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 bool - ShouldStop (Event *event_ptr); + bool + ShouldStop(Event *event_ptr) override; - virtual bool - MischiefManaged (); + bool + MischiefManaged() override; - virtual bool - WillStop (); + bool + WillStop() override; - virtual bool - StopOthers (); + bool + StopOthers() override; - virtual void - DidPush (); + void + DidPush() override; protected: - virtual bool - DoPlanExplainsStop (Event *event_ptr); + bool + DoPlanExplainsStop(Event *event_ptr) override; - virtual lldb::StateType - GetPlanRunState (); + lldb::StateType + GetPlanRunState() override; private: - std::string m_class_name; - StructuredData::ObjectSP m_implementation_sp; + std::string m_class_name; + StructuredData::ObjectSP m_implementation_sp; DISALLOW_COPY_AND_ASSIGN(ThreadPlanPython); }; - } // namespace lldb_private -#endif // liblldb_ThreadPlan_Python_h_ +#endif // liblldb_ThreadPlan_Python_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanRunToAddress.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanRunToAddress.h +++ lldb/trunk/include/lldb/Target/ThreadPlanRunToAddress.h @@ -36,37 +36,35 @@ const std::vector &addresses, bool stop_others); + ~ThreadPlanRunToAddress() override; - virtual - ~ThreadPlanRunToAddress (); + void + GetDescription(Stream *s, lldb::DescriptionLevel level) override; - virtual void - GetDescription (Stream *s, lldb::DescriptionLevel level); + bool + ValidatePlan(Stream *error) override; - virtual bool - ValidatePlan (Stream *error); + bool + ShouldStop(Event *event_ptr) override; - virtual bool - ShouldStop (Event *event_ptr); - - virtual bool - StopOthers (); + bool + StopOthers() override; - virtual void - SetStopOthers (bool new_value); + void + SetStopOthers(bool new_value) override; - virtual lldb::StateType - GetPlanRunState (); + lldb::StateType + GetPlanRunState() override; - virtual bool - WillStop (); + bool + WillStop() override; - virtual bool - MischiefManaged (); + bool + MischiefManaged() override; protected: - virtual bool - DoPlanExplainsStop (Event *event_ptr); + bool + DoPlanExplainsStop(Event *event_ptr) override; void SetInitialBreakpoints(); bool AtOurAddress(); @@ -77,9 +75,8 @@ std::vector m_break_ids; // This is the breakpoint we are using to stop us at m_address. DISALLOW_COPY_AND_ASSIGN (ThreadPlanRunToAddress); - }; } // namespace lldb_private -#endif // liblldb_ThreadPlanRunToAddress_h_ +#endif // liblldb_ThreadPlanRunToAddress_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanStepInRange.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanStepInRange.h +++ lldb/trunk/include/lldb/Target/ThreadPlanStepInRange.h @@ -42,14 +42,13 @@ LazyBool step_in_avoids_code_without_debug_info, LazyBool step_out_avoids_code_without_debug_info); - virtual - ~ThreadPlanStepInRange (); + ~ThreadPlanStepInRange() override; - virtual void - GetDescription (Stream *s, lldb::DescriptionLevel level); + void + GetDescription(Stream *s, lldb::DescriptionLevel level) override; - virtual bool - ShouldStop (Event *event_ptr); + bool + ShouldStop(Event *event_ptr) override; void SetAvoidRegexp(const char *name); @@ -62,19 +61,19 @@ SetDefaultFlagValue (uint32_t new_value); bool - IsVirtualStep(); + IsVirtualStep() override; protected: static bool DefaultShouldStopHereCallback (ThreadPlan *current_plan, Flags &flags, lldb::FrameComparison operation, void *baton); - virtual bool DoWillResume (lldb::StateType resume_state, bool current_plan); + bool DoWillResume(lldb::StateType resume_state, bool current_plan) override; - virtual bool - DoPlanExplainsStop (Event *event_ptr); + bool + DoPlanExplainsStop(Event *event_ptr) override; - virtual void - SetFlagsToDefault () + void + SetFlagsToDefault() override { GetFlags().Set(ThreadPlanStepInRange::s_default_flag_values); } @@ -119,9 +118,8 @@ bool m_virtual_step; // true if we've just done a "virtual step", i.e. just moved the inline stack depth. ConstString m_step_into_target; DISALLOW_COPY_AND_ASSIGN (ThreadPlanStepInRange); - }; } // namespace lldb_private -#endif // liblldb_ThreadPlanStepInRange_h_ +#endif // liblldb_ThreadPlanStepInRange_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanStepInstruction.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanStepInstruction.h +++ lldb/trunk/include/lldb/Target/ThreadPlanStepInstruction.h @@ -23,19 +23,19 @@ class ThreadPlanStepInstruction : public ThreadPlan { public: - virtual ~ThreadPlanStepInstruction (); + ~ThreadPlanStepInstruction() override; - virtual void GetDescription (Stream *s, lldb::DescriptionLevel level); - virtual bool ValidatePlan (Stream *error); - virtual bool ShouldStop (Event *event_ptr); - virtual bool StopOthers (); - virtual lldb::StateType GetPlanRunState (); - virtual bool WillStop (); - virtual bool MischiefManaged (); - virtual bool IsPlanStale (); + void GetDescription(Stream *s, lldb::DescriptionLevel level) override; + bool ValidatePlan(Stream *error) override; + bool ShouldStop(Event *event_ptr) override; + bool StopOthers() override; + lldb::StateType GetPlanRunState() override; + bool WillStop() override; + bool MischiefManaged() override; + bool IsPlanStale() override; protected: - virtual bool DoPlanExplainsStop (Event *event_ptr); + bool DoPlanExplainsStop(Event *event_ptr) override; ThreadPlanStepInstruction (Thread &thread, bool step_over, @@ -57,10 +57,8 @@ StackID m_parent_frame_id; DISALLOW_COPY_AND_ASSIGN (ThreadPlanStepInstruction); - }; - } // namespace lldb_private -#endif // liblldb_ThreadPlanStepInstruction_h_ +#endif // liblldb_ThreadPlanStepInstruction_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanStepOut.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanStepOut.h +++ lldb/trunk/include/lldb/Target/ThreadPlanStepOut.h @@ -33,32 +33,32 @@ uint32_t frame_idx, LazyBool step_out_avoids_code_without_debug_info); - virtual ~ThreadPlanStepOut (); + ~ThreadPlanStepOut() override; - virtual void GetDescription (Stream *s, lldb::DescriptionLevel level); - virtual bool ValidatePlan (Stream *error); - virtual bool ShouldStop (Event *event_ptr); - virtual bool StopOthers (); - virtual lldb::StateType GetPlanRunState (); - virtual bool WillStop (); - virtual bool MischiefManaged (); - virtual void DidPush(); - virtual bool IsPlanStale(); + void GetDescription(Stream *s, lldb::DescriptionLevel level) override; + bool ValidatePlan(Stream *error) override; + bool ShouldStop(Event *event_ptr) override; + bool StopOthers() override; + lldb::StateType GetPlanRunState() override; + bool WillStop() override; + bool MischiefManaged() override; + void DidPush() override; + bool IsPlanStale() override; - virtual lldb::ValueObjectSP GetReturnValueObject() + lldb::ValueObjectSP GetReturnValueObject() override { return m_return_valobj_sp; } protected: - virtual void - SetFlagsToDefault () + void + SetFlagsToDefault() override { GetFlags().Set(ThreadPlanStepOut::s_default_flag_values); } - virtual bool DoPlanExplainsStop (Event *event_ptr); - virtual bool DoWillResume (lldb::StateType resume_state, bool current_plan); + bool DoPlanExplainsStop (Event *event_ptr) override; + bool DoWillResume(lldb::StateType resume_state, bool current_plan) override; bool QueueInlinedStepPlan (bool queue_now); private: @@ -95,9 +95,8 @@ CalculateReturnValue(); DISALLOW_COPY_AND_ASSIGN (ThreadPlanStepOut); - }; } // namespace lldb_private -#endif // liblldb_ThreadPlanStepOut_h_ +#endif // liblldb_ThreadPlanStepOut_h_ Index: lldb/trunk/include/lldb/Target/ThreadPlanStepOverBreakpoint.h =================================================================== --- lldb/trunk/include/lldb/Target/ThreadPlanStepOverBreakpoint.h +++ lldb/trunk/include/lldb/Target/ThreadPlanStepOverBreakpoint.h @@ -22,29 +22,31 @@ class ThreadPlanStepOverBreakpoint : public ThreadPlan { public: - virtual ~ThreadPlanStepOverBreakpoint (); - ThreadPlanStepOverBreakpoint (Thread &thread); - virtual void GetDescription (Stream *s, lldb::DescriptionLevel level); - virtual bool ValidatePlan (Stream *error); - virtual bool ShouldStop (Event *event_ptr); - virtual bool StopOthers (); - virtual lldb::StateType GetPlanRunState (); - virtual bool WillStop (); - virtual bool MischiefManaged (); - virtual void ThreadDestroyed (); - void SetAutoContinue (bool do_it); - virtual bool ShouldAutoContinue(Event *event_ptr); - virtual bool IsPlanStale(); + + ~ThreadPlanStepOverBreakpoint() override; + + void GetDescription(Stream *s, lldb::DescriptionLevel level) override; + bool ValidatePlan(Stream *error) override; + bool ShouldStop(Event *event_ptr) override; + bool StopOthers() override; + lldb::StateType GetPlanRunState() override; + bool WillStop() override; + bool MischiefManaged() override; + void ThreadDestroyed() override; + void SetAutoContinue(bool do_it); + bool ShouldAutoContinue(Event *event_ptr) override; + bool IsPlanStale() override; lldb::addr_t GetBreakpointLoadAddress() const { return m_breakpoint_addr; } + protected: - virtual bool DoPlanExplainsStop (Event *event_ptr); - virtual bool DoWillResume (lldb::StateType resume_state, bool current_plan); + bool DoPlanExplainsStop(Event *event_ptr) override; + bool DoWillResume(lldb::StateType resume_state, bool current_plan) override; void ReenableBreakpointSite (); private: @@ -55,9 +57,8 @@ bool m_reenabled_breakpoint_site; DISALLOW_COPY_AND_ASSIGN (ThreadPlanStepOverBreakpoint); - }; } // namespace lldb_private -#endif // liblldb_ThreadPlanStepOverBreakpoint_h_ +#endif // liblldb_ThreadPlanStepOverBreakpoint_h_