<rdar://problem/11672978> Fixing an issue where an ObjC object might come out without a description because the expression used to obtain it would timeout before running to completion

llvm-svn: 160326

1 files changed, 9 insertions, 7 deletions

diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 4fed8413b56..029b1539529 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -542,7 +542,8 @@ ClangUserExpression::Execute (Stream &error_stream,
                               ExecutionContext &exe_ctx,
                               bool discard_on_error,
                               ClangUserExpression::ClangUserExpressionSP &shared_ptr_to_me,
-                              lldb::ClangExpressionVariableSP &result)
+                              lldb::ClangExpressionVariableSP &result,
+                              uint32_t single_thread_timeout_usec)
 {
     // The expression log is quite verbose, and if you're just tracking the execution of the
     // expression, it's quite convenient to have these logs come out with the STEP log as well.
@@ -578,8 +579,6 @@ ClangUserExpression::Execute (Stream &error_stream,
     
         call_plan_sp->SetPrivate(true);
     
-        uint32_t single_thread_timeout_usec = 500000;
-        
         if (log)
             log->Printf("-- [ClangUserExpression::Execute] Execution of expression begins --");
         
@@ -648,10 +647,11 @@ ClangUserExpression::Evaluate (ExecutionContext &exe_ctx,
                                bool discard_on_error,
                                const char *expr_cstr,
                                const char *expr_prefix,
-                               lldb::ValueObjectSP &result_valobj_sp)
+                               lldb::ValueObjectSP &result_valobj_sp,
+                               uint32_t single_thread_timeout_usec)
 {
     Error error;
-    return EvaluateWithError (exe_ctx, execution_policy, language, desired_type, discard_on_error, expr_cstr, expr_prefix, result_valobj_sp, error);
+    return EvaluateWithError (exe_ctx, execution_policy, language, desired_type, discard_on_error, expr_cstr, expr_prefix, result_valobj_sp, error, single_thread_timeout_usec);
 }
 
 ExecutionResults
@@ -663,7 +663,8 @@ ClangUserExpression::EvaluateWithError (ExecutionContext &exe_ctx,
                                         const char *expr_cstr,
                                         const char *expr_prefix,
                                         lldb::ValueObjectSP &result_valobj_sp,
-                                        Error &error)
+                                        Error &error,
+                                        uint32_t single_thread_timeout_usec)
 {
     lldb::LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
 
@@ -738,7 +739,8 @@ ClangUserExpression::EvaluateWithError (ExecutionContext &exe_ctx,
                                                              exe_ctx, 
                                                              discard_on_error,
                                                              user_expression_sp, 
-                                                             expr_result);
+                                                             expr_result,
+                                                             single_thread_timeout_usec);
             
             if (execution_results != eExecutionCompleted)
             {