diff options
| author | Adrian Prantl <aprantl@apple.com> | 2022-10-17 17:27:10 -0700 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2022-10-17 17:27:54 -0700 |
| commit | 2c9093e649c4078c1083f489b72dda7ad54baea5 (patch) | |
| tree | 85bd9e5fc6db9ecd266e7a07491c123a0c308aa4 | |
| parent | d5a99bf5e134b31cf6ef3219313fa7d2fc480629 (diff) | |
| download | llvm-2c9093e649c4078c1083f489b72dda7ad54baea5.zip llvm-2c9093e649c4078c1083f489b72dda7ad54baea5.tar.gz llvm-2c9093e649c4078c1083f489b72dda7ad54baea5.tar.bz2 | |
Revert "Make sure Target::EvaluateExpression() passes up an error instead of silently dropping it."
This reverts commit a31a5da3c7d7393749a43dbc678fd28fb94d07f6.
| -rw-r--r-- | lldb/source/Commands/CommandObjectExpression.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Target/Target.cpp | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index be306f2..b7d129e 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -461,8 +461,6 @@ bool CommandObjectExpression::EvaluateExpression(llvm::StringRef expr, result.SetStatus(eReturnStatusFailed); } } - } else { - error_stream.Printf("error: unknown error\n"); } return (success != eExpressionSetupError && diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index f1a311b..c567407 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -26,7 +26,6 @@ #include "lldb/Core/StreamFile.h" #include "lldb/Core/StructuredDataImpl.h" #include "lldb/Core/ValueObject.h" -#include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/DiagnosticManager.h" #include "lldb/Expression/ExpressionVariable.h" #include "lldb/Expression/REPL.h" @@ -2529,10 +2528,6 @@ ExpressionResults Target::EvaluateExpression( execution_results = UserExpression::Evaluate(exe_ctx, options, expr, prefix, result_valobj_sp, error, fixed_expression, ctx_obj); - // Pass up the error by wrapping it inside an error result. - if (error.Fail() && !result_valobj_sp) - result_valobj_sp = ValueObjectConstResult::Create( - exe_ctx.GetBestExecutionContextScope(), error); } if (execution_results == eExpressionCompleted) |