maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Clean up stop hook output in case a hook restarts. 

I was warning about the fact that this will abort
further stop hooks, but didn't check that there WAS
a further stop hook.  Also the warning was missing a
newline.

llvm-svn: 319730
This commit is contained in:
Jim Ingham 2017-12-05 02:34:05 +00:00
parent 80b55ee62d
commit 45816d6b91
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lldb/source/Target/Target.cpp
View File

@ -2679,6 +2679,10 @@ void Target::RunStopHooks() {
if (!m_process_sp) if (!m_process_sp)
return; return;
// Somebody might have restarted the process:
if (m_process_sp->GetState() != eStateStopped)
return;
// <rdar://problem/12027563> make sure we check that we are not stopped // <rdar://problem/12027563> make sure we check that we are not stopped
// because of us running a user expression // because of us running a user expression
@ -2784,9 +2788,12 @@ void Target::RunStopHooks() {
// running the stop hooks. // running the stop hooks.
if ((result.GetStatus() == eReturnStatusSuccessContinuingNoResult) || if ((result.GetStatus() == eReturnStatusSuccessContinuingNoResult) ||
(result.GetStatus() == eReturnStatusSuccessContinuingResult)) { (result.GetStatus() == eReturnStatusSuccessContinuingResult)) {
result.AppendMessageWithFormat("Aborting stop hooks, hook %" PRIu64 // But only complain if there were more stop hooks to do:
" set the program running.", StopHookCollection::iterator tmp = pos;
cur_hook_sp->GetID()); if (++tmp != end)
result.AppendMessageWithFormat("\nAborting stop hooks, hook %" PRIu64
" set the program running.\n",
cur_hook_sp->GetID());
keep_going = false; keep_going = false;
} }
} }