Moved the code in ClangUserExpression that set up & ran the thread plan with timeouts, and restarting with all threads into a utility function in Process. This required a bunch of renaming.

Added a ThreadPlanCallUserExpression that differs from ThreadPlanCallFunction in that it holds onto a shared pointer to its ClangUserExpression so that can't go away before the thread plan is done using it.

Fixed the stop message when you hit a breakpoint while running a user expression so it is more obvious what has happened.

llvm-svn: 120386

1 files changed, 3 insertions, 3 deletions

diff --git a/lldb/source/Commands/CommandObjectCall.cpp b/lldb/source/Commands/CommandObjectCall.cpp
index 9a1a7977d78..11dab9b710f 100644
--- a/lldb/source/Commands/CommandObjectCall.cpp
+++ b/lldb/source/Commands/CommandObjectCall.cpp
@@ -292,20 +292,20 @@ CommandObjectCall::Execute
             }
         }
         
-        ClangFunction::ExecutionResults return_status;
+        Process::ExecutionResults return_status;
         Value return_value;
         
         bool stop_others = true;
         return_status = clang_fun.ExecuteFunction(exe_ctx, errors, stop_others, NULL, return_value);
 
         // Now figure out what to do with the return value.
-        if (return_status == ClangFunction::eExecutionSetupError)
+        if (return_status == Process::eExecutionSetupError)
         {
             result.AppendErrorWithFormat("Error setting up function execution: '%s'.\n", errors.GetData());
             result.SetStatus (eReturnStatusFailed);
             return false;
         }
-        else if (return_status != ClangFunction::eExecutionCompleted)
+        else if (return_status != Process::eExecutionCompleted)
         {
             result.AppendWarningWithFormat("Interrupted while calling function: '%s'.\n", errors.GetData());
             result.SetStatus(eReturnStatusSuccessFinishNoResult);