Revert "Return a named error in the result object of an expression with no result"
This reverts commit r344647.
This causes build failures with [-Werror, -Wswitch]. Some cases where the newly
introduced enum value is not handled in particular are in:
lldb/source/Expression/REPL.cpp:350
lldb/source/Interpreter/CommandInterpreter.cpp:1529
(maybe there could be more)
As I don't understand lldb to make sure the likely trivial fixes are
correct and also as they might need additional tests, leaving to the
author to resolve.
llvm-svn: 344722
diff --git a/lldb/source/Expression/UserExpression.cpp b/lldb/source/Expression/UserExpression.cpp
index 1477bbd..34945fd 100644
--- a/lldb/source/Expression/UserExpression.cpp
+++ b/lldb/source/Expression/UserExpression.cpp
@@ -151,9 +151,6 @@
? UserExpression::eResultTypeId
: UserExpression::eResultTypeAny;
lldb::ExpressionResults execution_results = lldb::eExpressionSetupError;
-
- static const char *no_result_error = "Expression completed successfully "
- "but had no result";
Target *target = exe_ctx.GetTargetPtr();
if (!target) {
@@ -307,8 +304,7 @@
error.SetExpressionError(lldb::eExpressionSetupError,
"expression needed to run but couldn't");
} else if (execution_policy == eExecutionPolicyTopLevel) {
- error.SetExpressionError(lldb::eExpressionProducedNoResult,
- no_result_error);
+ error.SetError(UserExpression::kNoResult, lldb::eErrorTypeGeneric);
return lldb::eExpressionCompleted;
} else {
if (options.InvokeCancelCallback(lldb::eExpressionEvaluationExecution)) {
@@ -353,8 +349,7 @@
log->Printf("== [UserExpression::Evaluate] Execution completed "
"normally with no result ==");
- error.SetExpressionError(lldb::eExpressionProducedNoResult,
- no_result_error);
+ error.SetError(UserExpression::kNoResult, lldb::eErrorTypeGeneric);
}
}
}