diff options
author | Daniel Malea <daniel.malea@intel.com> | 2013-05-01 19:11:56 +0000 |
---|---|---|
committer | Daniel Malea <daniel.malea@intel.com> | 2013-05-01 19:11:56 +0000 |
commit | 54e39db805c2bea78b600dd56fc08c0250928cca (patch) | |
tree | 3c87a8567a640a351b1fcbfe9c31d619694d6e36 /lldb/source/Plugins/Process/MacOSX-Kernel | |
parent | df6bee8081f6debda857a04247a88c37586df73d (diff) | |
download | bcm5719-llvm-54e39db805c2bea78b600dd56fc08c0250928cca.tar.gz bcm5719-llvm-54e39db805c2bea78b600dd56fc08c0250928cca.zip |
Reverting 180831 as it crashes TestDefaultConstructorForAPIObjects.py
llvm-svn: 180868
Diffstat (limited to 'lldb/source/Plugins/Process/MacOSX-Kernel')
-rw-r--r-- | lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp | 10 | ||||
-rw-r--r-- | lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index f9b1055644b..9e4cc568af5 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -507,12 +507,12 @@ ProcessKDP::DoHalt (bool &caused_stop) } Error -ProcessKDP::DoDetach(bool keep_stopped) +ProcessKDP::DoDetach() { Error error; Log *log (ProcessKDPLog::GetLogIfAllCategoriesSet(KDP_LOG_PROCESS)); if (log) - log->Printf ("ProcessKDP::DoDetach(keep_stopped = %i)", keep_stopped); + log->Printf ("ProcessKDP::DoDetach()"); if (m_comm.IsRunning()) { @@ -525,8 +525,7 @@ ProcessKDP::DoDetach(bool keep_stopped) m_thread_list.DiscardThreadPlans(); - // If we are going to keep the target stopped, then don't send the disconnect message. - if (!keep_stopped && m_comm.IsConnected()) + if (m_comm.IsConnected()) { m_comm.SendRequestDisconnect(); @@ -555,8 +554,7 @@ Error ProcessKDP::DoDestroy () { // For KDP there really is no difference between destroy and detach - bool keep_stopped = false; - return DoDetach(keep_stopped); + return DoDetach(); } //------------------------------------------------------------------ diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h index 9de262322ae..fba221ea5ed 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -135,7 +135,7 @@ public: DoHalt (bool &caused_stop); virtual lldb_private::Error - DoDetach (bool keep_stopped); + DoDetach (); virtual lldb_private::Error DoSignal (int signal); |