Date: Wed, 19 Mar 2014 13:15:17 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r263365 - stable/10/contrib/llvm/tools/lldb/source/Target Message-ID: <201403191315.s2JDFHWX045802@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed Mar 19 13:15:16 2014 New Revision: 263365 URL: http://svnweb.freebsd.org/changeset/base/263365 Log: MFC r258098: Merge upstream LLDB r194487: Log failure to restore thread state in ThreadPlanCallFunction::DoTakedown In order to help track down llvm.org/pr17226. Sponsored by: DARPA, AFRL Modified: stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp ============================================================================== --- stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp Wed Mar 19 13:13:47 2014 (r263364) +++ stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp Wed Mar 19 13:15:16 2014 (r263365) @@ -511,8 +511,7 @@ Thread::CheckpointThreadState (ThreadSta bool Thread::RestoreRegisterStateFromCheckpoint (ThreadStateCheckpoint &saved_state) { - RestoreSaveFrameZero(saved_state.register_backup); - return true; + return RestoreSaveFrameZero(saved_state.register_backup); } bool Modified: stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp ============================================================================== --- stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Wed Mar 19 13:13:47 2014 (r263364) +++ stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Wed Mar 19 13:15:16 2014 (r263365) @@ -299,7 +299,11 @@ ThreadPlanCallFunction::DoTakedown (bool 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())
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403191315.s2JDFHWX045802>