Re-enabled LLDB's pointer checkers, and moved the

implementation of the Objective-C object checkers
into the Objective-C language runtime.

llvm-svn: 118226

1 files changed, 12 insertions, 4 deletions

diff --git a/lldb/source/Target/ThreadPlanCallFunction.cpp b/lldb/source/Target/ThreadPlanCallFunction.cpp
index 65349ddaeb7..85de672a63d 100644
--- a/lldb/source/Target/ThreadPlanCallFunction.cpp
+++ b/lldb/source/Target/ThreadPlanCallFunction.cpp
@@ -150,6 +150,17 @@ ThreadPlanCallFunction::ThreadPlanCallFunction (Thread &thread,
 
 ThreadPlanCallFunction::~ThreadPlanCallFunction ()
 {
+    if (m_valid && !IsPlanComplete())
+        DoTakedown();
+}
+
+void
+ThreadPlanCallFunction::DoTakedown ()
+{
+    m_thread.RestoreSaveFrameZero(m_register_backup);
+    m_thread.ClearStackFrames();
+    SetPlanComplete();
+    ClearBreakpoints();
 }
 
 void
@@ -253,11 +264,8 @@ ThreadPlanCallFunction::ShouldStop (Event *event_ptr)
             }
         }
         
-        m_thread.RestoreSaveFrameZero(m_register_backup);
-        m_thread.ClearStackFrames();
-        SetPlanComplete();
+        DoTakedown();
         
-        ClearBreakpoints();
         return true;
     }
     else