diff options
Diffstat (limited to 'include/lldb/Target/ThreadPlanStepOut.h')
-rw-r--r-- | include/lldb/Target/ThreadPlanStepOut.h | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/include/lldb/Target/ThreadPlanStepOut.h b/include/lldb/Target/ThreadPlanStepOut.h index 2737978a4edc..8c140dc9d95d 100644 --- a/include/lldb/Target/ThreadPlanStepOut.h +++ b/include/lldb/Target/ThreadPlanStepOut.h @@ -16,10 +16,12 @@ // Project includes #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadPlan.h" +#include "lldb/Target/ThreadPlanShouldStopHere.h" namespace lldb_private { -class ThreadPlanStepOut : public ThreadPlan +class ThreadPlanStepOut : public ThreadPlan, + public ThreadPlanShouldStopHere { public: ThreadPlanStepOut (Thread &thread, @@ -28,7 +30,8 @@ public: bool stop_others, Vote stop_vote, Vote run_vote, - uint32_t frame_idx); + uint32_t frame_idx, + LazyBool step_out_avoids_code_without_debug_info); virtual ~ThreadPlanStepOut (); @@ -48,21 +51,29 @@ public: } protected: + virtual void + SetFlagsToDefault () + { + GetFlags().Set(ThreadPlanStepOut::s_default_flag_values); + } + virtual bool DoPlanExplainsStop (Event *event_ptr); virtual bool DoWillResume (lldb::StateType resume_state, bool current_plan); bool QueueInlinedStepPlan (bool queue_now); private: - SymbolContext *m_step_from_context; + static uint32_t s_default_flag_values; // These are the default flag values for the ThreadPlanStepThrough. + lldb::addr_t m_step_from_insn; StackID m_step_out_to_id; StackID m_immediate_step_from_id; lldb::break_id_t m_return_bp_id; lldb::addr_t m_return_addr; - bool m_first_insn; bool m_stop_others; - lldb::ThreadPlanSP m_step_through_inline_plan_sp; - lldb::ThreadPlanSP m_step_out_plan_sp; + lldb::ThreadPlanSP m_step_out_to_inline_plan_sp; // This plan implements step out to the real function containing + // an inlined frame so we can then step out of that. + lldb::ThreadPlanSP m_step_through_inline_plan_sp; // This plan then steps past the inlined frame(s). + lldb::ThreadPlanSP m_step_out_further_plan_sp; // This plan keeps stepping out if ShouldStopHere told us to. Function *m_immediate_step_from_function; lldb::ValueObjectSP m_return_valobj_sp; @@ -73,8 +84,10 @@ private: bool stop_others, Vote stop_vote, Vote run_vote, - uint32_t frame_idx); + uint32_t frame_idx, + LazyBool step_out_avoids_code_without_debug_info); + void SetupAvoidNoDebug(LazyBool step_out_avoids_code_without_debug_info); // Need an appropriate marker for the current stack so we can tell step out // from step in. |