Skip to content

Commit 68375da

Browse files
author
git apple-llvm automerger
committed
Merge commit '299c632af12f' from swift/release/5.9 into stable/20221013
2 parents 2b5ff47 + 299c632 commit 68375da

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

lldb/source/Expression/UserExpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
256256
target->GetUserExpressionForLanguage(expr, full_prefix, language,
257257
desired_type, options, ctx_obj,
258258
error));
259-
if (error.Fail()) {
259+
if (error.Fail() || !user_expression_sp) {
260260
LLDB_LOG(log, "== [UserExpression::Evaluate] Getting expression: {0} ==",
261261
error.AsCString());
262262
return lldb::eExpressionSetupError;

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,10 @@ SwiftLanguageRuntimeImpl::RunObjectDescriptionExpr(ValueObject &object,
10441044
frame_sp
10451045
= m_process.GetThreadList().GetSelectedThread()
10461046
->GetSelectedFrame(DoNoSelectMostRelevantFrame);
1047+
if (!frame_sp) {
1048+
log->Printf("no execution context to run expression in");
1049+
return false;
1050+
}
10471051
auto eval_result = m_process.GetTarget().EvaluateExpression(
10481052
expr_string,
10491053
frame_sp.get(),

0 commit comments

Comments
 (0)