In ThreadPlanCallFunction, do the Takedown right when the thread plan gets popped. When the function call is discarded (e.g. when it crashes and discard_on_error is true) the plan gets discarded. You need to make sure that the stack gets restored right then, and not wait till you start again and the thread plan stack is cleared.

llvm-svn: 123716

lldb/include/lldb/Target/ThreadPlanCallFunction.h

@@ -69,6 +69,9 @@ public:
     {
         return true;
     }
+    
+    virtual void
+    WillPop ();
 
 protected:
 private:

lldb/source/Target/ThreadPlanCallFunction.cpp

@@ -128,6 +128,13 @@ ThreadPlanCallFunction::DoTakedown ()
     ClearBreakpoints();
 }
 
+void
+ThreadPlanCallFunction::WillPop ()
+{
+    if (m_valid && !IsPlanComplete())
+        DoTakedown();
+}
+
 void
 ThreadPlanCallFunction::GetDescription (Stream *s, lldb::DescriptionLevel level)
 {