Skip to content

[lldb] Improve user expression diagnostics #123242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JDevlieghere merged 2 commits into from
Jan 17, 2025
Merged

[lldb] Improve user expression diagnostics #123242

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db80b44
[lldb] Improve user expression diagnostics
JDevlieghere Jan 16, 2025
695e475
Update tests
JDevlieghere Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions lldb/source/Expression/LLVMUserExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,18 +187,22 @@ LLVMUserExpression::DoExecute(DiagnosticManager &diagnostic_manager,
if (execution_result == lldb::eExpressionInterrupted ||
execution_result == lldb::eExpressionHitBreakpoint) {
const char *error_desc = nullptr;
const char *explanation = execution_result == lldb::eExpressionInterrupted
? "was interrupted"
: "hit a breakpoint";

if (user_expression_plan) {
if (auto real_stop_info_sp = user_expression_plan->GetRealStopInfo())
error_desc = real_stop_info_sp->GetDescription();
}

if (error_desc)
diagnostic_manager.Printf(lldb::eSeverityError,
"Execution was interrupted, reason: %s.",
"Expression execution %s: %s.", explanation,
error_desc);
else
diagnostic_manager.PutString(lldb::eSeverityError,
"Execution was interrupted.");
diagnostic_manager.Printf(lldb::eSeverityError,
"Expression execution %s.", explanation);

if ((execution_result == lldb::eExpressionInterrupted &&
options.DoesUnwindOnError()) ||
Expand All @@ -212,31 +216,35 @@ LLVMUserExpression::DoExecute(DiagnosticManager &diagnostic_manager,
user_expression_plan->TransferExpressionOwnership();
diagnostic_manager.AppendMessageToDiagnostic(
"The process has been left at the point where it was "
"interrupted, "
"use \"thread return -x\" to return to the state before "
"expression evaluation.");
"interrupted, use \"thread return -x\" to return to the state "
"before expression evaluation.");
}

return execution_result;
} else if (execution_result == lldb::eExpressionStoppedForDebug) {
}

if (execution_result == lldb::eExpressionStoppedForDebug) {
diagnostic_manager.PutString(
lldb::eSeverityInfo,
"Execution was halted at the first instruction of the expression "
"function because \"debug\" was requested.\n"
"Expression execution was halted at the first instruction of the "
"expression function because \"debug\" was requested.\n"
"Use \"thread return -x\" to return to the state before expression "
"evaluation.");
return execution_result;
} else if (execution_result == lldb::eExpressionThreadVanished) {
diagnostic_manager.Printf(
lldb::eSeverityError,
"Couldn't complete execution; the thread "
"on which the expression was being run: 0x%" PRIx64
" exited during its execution.",
expr_thread_id);
}

if (execution_result == lldb::eExpressionThreadVanished) {
diagnostic_manager.Printf(lldb::eSeverityError,
"Couldn't execute expression: the thread on "
"which the expression was being run (0x%" PRIx64
") exited during its execution.",
expr_thread_id);
return execution_result;
} else if (execution_result != lldb::eExpressionCompleted) {
}

if (execution_result != lldb::eExpressionCompleted) {
diagnostic_manager.Printf(lldb::eSeverityError,
"Couldn't execute function; result was %s",
"Couldn't execute expression: result was %s",
toString(execution_result).c_str());
return execution_result;
}
Expand All @@ -245,9 +253,9 @@ LLVMUserExpression::DoExecute(DiagnosticManager &diagnostic_manager,
if (FinalizeJITExecution(diagnostic_manager, exe_ctx, result,
function_stack_bottom, function_stack_top)) {
return lldb::eExpressionCompleted;
} else {
return lldb::eExpressionResultUnavailable;
}

return lldb::eExpressionResultUnavailable;
}

bool LLVMUserExpression::FinalizeJITExecution(
Expand Down
Loading