d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge upstream LLDB r194487:

Browse Source 
Log failure to restore thread state in ThreadPlanCallFunction::DoTakedown

  In order to help track down llvm.org/pr17226.

Sponsored by:	DARPA, AFRL
This commit is contained in:
Ed Maste 2013-11-13 17:06:26 +00:00
parent 11a90beea4
commit afda932a71
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/llvm/tools/lldb/source/Target/Thread.cpp
View File

@ -511,8 +511,7 @@ Thread::CheckpointThreadState (ThreadStateCheckpoint &saved_state)
bool
Thread::RestoreRegisterStateFromCheckpoint (ThreadStateCheckpoint &saved_state)
{
RestoreSaveFrameZero(saved_state.register_backup);
return true;
return RestoreSaveFrameZero(saved_state.register_backup);
}
bool

6
contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp
View File

@ -299,7 +299,11 @@ ThreadPlanCallFunction::DoTakedown (bool success)
m_takedown_done = true;
m_stop_address = m_thread.GetStackFrameAtIndex(0)->GetRegisterContext()->GetPC();
m_real_stop_info_sp = GetPrivateStopInfo ();
m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state);
if (!m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state))
{
if (log)
log->Printf("ThreadPlanCallFunction(%p): DoTakedown failed to restore register state", this);
}
SetPlanComplete(success);
ClearBreakpoints();
if (log && log->GetVerbose())