diff options
author | Andrew MacPherson <andrew.macp@gmail.com> | 2014-03-25 19:59:36 +0000 |
---|---|---|
committer | Andrew MacPherson <andrew.macp@gmail.com> | 2014-03-25 19:59:36 +0000 |
commit | c3826b5ba6a434a1783c4e5b02a9ea2750589177 (patch) | |
tree | 8b2818c8ef88619a4e91a0700bd11385d25f0811 | |
parent | 9287289d66cd7c44d66916e9a1ff918790649bfe (diff) | |
download | bcm5719-llvm-c3826b5ba6a434a1783c4e5b02a9ea2750589177.tar.gz bcm5719-llvm-c3826b5ba6a434a1783c4e5b02a9ea2750589177.zip |
Move calls to DisableAllBreakpointSites() and m_thread_list.DiscardThreadPlans() into base Process::Destroy() instead of in subclass DoDestroy() methods.
llvm-svn: 204752
4 files changed, 3 insertions, 10 deletions
diff --git a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp index 6984a0c536c..92a464f9ecf 100644 --- a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp +++ b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp @@ -133,8 +133,6 @@ ProcessFreeBSD::DoDetach(bool keep_stopped) return error; } - DisableAllBreakpointSites(); - error = m_monitor->Detach(GetID()); if (error.Success()) diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index d6f84b3293e..6be373ce9e2 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -599,10 +599,6 @@ ProcessKDP::DoDetach(bool keep_stopped) } else { - DisableAllBreakpointSites (); - - 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()) { diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 59689860916..1bee5806e5f 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -1866,10 +1866,6 @@ ProcessGDBRemote::DoDetach(bool keep_stopped) if (log) log->Printf ("ProcessGDBRemote::DoDetach(keep_stopped: %i)", keep_stopped); - DisableAllBreakpointSites (); - - m_thread_list.DiscardThreadPlans(); - error = m_gdb_comm.Detach (keep_stopped); if (log) { diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index f9088252111..32dda344a0f 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -3692,6 +3692,9 @@ Process::Detach (bool keep_stopped) } } + m_thread_list.DiscardThreadPlans(); + DisableAllBreakpointSites(); + error = DoDetach(keep_stopped); if (error.Success()) { |