Skip to content

[lldb][nfc] Factor out repeated code in DWIM Print #85669

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
merged 2 commits into from
Mar 18, 2024
Merged

[lldb][nfc] Factor out repeated code in DWIM Print #85669

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa85a2
[lldb][nfc] Factor out repeated code in DWIM Print
felipepiovezan Mar 18, 2024
d6d2120
fixup! also use new lambda on persisent variable case
felipepiovezan Mar 18, 2024
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
36 changes: 16 additions & 20 deletions lldb/source/Commands/CommandObjectDWIMPrint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,19 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
}
};

// Dump `valobj` according to whether `po` was requested or not.
auto dump_val_object = [&](ValueObject &valobj) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind also applying this function to the block that handles persistent variables (I just added it in #85152). Thanks.

if (is_po) {
StreamString temp_result_stream;
valobj.Dump(temp_result_stream, dump_options);
llvm::StringRef output = temp_result_stream.GetString();
maybe_add_hint(output);
result.GetOutputStream() << output;
} else {
valobj.Dump(result.GetOutputStream(), dump_options);
}
};

// First, try `expr` as the name of a frame variable.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. I'd prefer to leave the "first", "second", "third" comments. I want to be explicit that there's an order of attempts.
  2. You'll need to rebase, I made a change last week that introduce some comments and code that you may need to incorporate.

if (frame) {
auto valobj_sp = frame->FindVariable(ConstString(expr));
Expand All @@ -146,15 +159,7 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
flags, expr);
}

if (is_po) {
StreamString temp_result_stream;
valobj_sp->Dump(temp_result_stream, dump_options);
llvm::StringRef output = temp_result_stream.GetString();
maybe_add_hint(output);
result.GetOutputStream() << output;
} else {
valobj_sp->Dump(result.GetOutputStream(), dump_options);
}
dump_val_object(*valobj_sp);
result.SetStatus(eReturnStatusSuccessFinishResult);
return;
}
Expand Down Expand Up @@ -196,17 +201,8 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
expr);
}

if (valobj_sp->GetError().GetError() != UserExpression::kNoResult) {
if (is_po) {
StreamString temp_result_stream;
valobj_sp->Dump(temp_result_stream, dump_options);
llvm::StringRef output = temp_result_stream.GetString();
maybe_add_hint(output);
result.GetOutputStream() << output;
} else {
valobj_sp->Dump(result.GetOutputStream(), dump_options);
}
}
if (valobj_sp->GetError().GetError() != UserExpression::kNoResult)
dump_val_object(*valobj_sp);

if (suppress_result)
if (auto result_var_sp =
Expand Down