diff options
| author | Jim Ingham <jingham@apple.com> | 2013-06-04 01:40:51 +0000 |
|---|---|---|
| committer | Jim Ingham <jingham@apple.com> | 2013-06-04 01:40:51 +0000 |
| commit | 60c4118c88d27b67235ecf3994560bc784f9150e (patch) | |
| tree | d8eb72dd7203a0106d7d441dee37ec0c43faefb9 /lldb/source/Target/ThreadPlanCallFunction.cpp | |
| parent | 19978553d4ed6aa71865cb1ece6aa65c22520525 (diff) | |
| download | bcm5719-llvm-60c4118c88d27b67235ecf3994560bc784f9150e.tar.gz bcm5719-llvm-60c4118c88d27b67235ecf3994560bc784f9150e.zip | |
If ThreadPlanCallFunction hasn't set its notion of the "real stop info" yet, just return the current PrivateStopInfo.
Also renamed a few more places where we were using StopReason in functions that were returning StopInfo's.
<rdar://problem/14042692>
llvm-svn: 183177
Diffstat (limited to 'lldb/source/Target/ThreadPlanCallFunction.cpp')
| -rw-r--r-- | lldb/source/Target/ThreadPlanCallFunction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/source/Target/ThreadPlanCallFunction.cpp b/lldb/source/Target/ThreadPlanCallFunction.cpp index 2b5af7cebeb..c9baaafffd6 100644 --- a/lldb/source/Target/ThreadPlanCallFunction.cpp +++ b/lldb/source/Target/ThreadPlanCallFunction.cpp @@ -298,7 +298,7 @@ ThreadPlanCallFunction::DoTakedown (bool success) log->Printf ("ThreadPlanCallFunction(%p): DoTakedown called for thread 0x%4.4" PRIx64 ", m_valid: %d complete: %d.\n", this, m_thread.GetID(), m_valid, IsPlanComplete()); m_takedown_done = true; m_stop_address = m_thread.GetStackFrameAtIndex(0)->GetRegisterContext()->GetPC(); - m_real_stop_info_sp = GetPrivateStopReason(); + m_real_stop_info_sp = GetPrivateStopInfo (); m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state); SetPlanComplete(success); ClearBreakpoints(); @@ -365,7 +365,7 @@ bool ThreadPlanCallFunction::DoPlanExplainsStop (Event *event_ptr) { Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP|LIBLLDB_LOG_PROCESS)); - m_real_stop_info_sp = GetPrivateStopReason(); + m_real_stop_info_sp = GetPrivateStopInfo (); // If our subplan knows why we stopped, even if it's done (which would forward the question to us) // we answer yes. @@ -584,7 +584,7 @@ ThreadPlanCallFunction::ClearBreakpoints () bool ThreadPlanCallFunction::BreakpointsExplainStop() { - StopInfoSP stop_info_sp = GetPrivateStopReason(); + StopInfoSP stop_info_sp = GetPrivateStopInfo (); if ((m_cxx_language_runtime && m_cxx_language_runtime->ExceptionBreakpointsExplainStop(stop_info_sp)) |
