Author: spyffe Date: Mon Mar 28 16:10:36 2016 New Revision: 264660 URL: http://llvm.org/viewvc/llvm-project?rev=264660&view=rev Log: Don't try to actually run code when the expression is top-level.
Modified: lldb/trunk/source/Expression/UserExpression.cpp Modified: lldb/trunk/source/Expression/UserExpression.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/UserExpression.cpp?rev=264660&r1=264659&r2=264660&view=diff ============================================================================== --- lldb/trunk/source/Expression/UserExpression.cpp (original) +++ lldb/trunk/source/Expression/UserExpression.cpp Mon Mar 28 16:10:36 2016 @@ -281,6 +281,11 @@ UserExpression::Evaluate (ExecutionConte if (!diagnostic_manager.Diagnostics().size()) error.SetExpressionError(lldb::eExpressionSetupError, "expression needed to run but couldn't"); } + else if (execution_policy == eExecutionPolicyTopLevel) + { + error.SetError(UserExpression::kNoResult, lldb::eErrorTypeGeneric); + return lldb::eExpressionCompleted; + } else { if (options.InvokeCancelCallback (lldb::eExpressionEvaluationExecution)) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits