Check both private & public states to decide if you need to halt before killing.
We were just checking the public state, but that meant if you were hung in a long
running hand-called function, we wouldn't know to interrupt the process, and we would
not succeed in killing it.
<rdar://problem/24805082>
llvm-svn: 276795
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 3d10654..b5a3794 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -3634,7 +3634,10 @@
Process::StopForDestroyOrDetach(lldb::EventSP &exit_event_sp)
{
Error error;
- if (m_public_state.GetValue() == eStateRunning)
+
+ // Check both the public & private states here. If we're hung evaluating an expression, for instance, then
+ // the public state will be stopped, but we still need to interrupt.
+ if (m_public_state.GetValue() == eStateRunning || m_private_state.GetValue() == eStateRunning)
{
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS));
if (log)