Skip to content

[lldb] Fallback to expression eval when Dump of variable fails in dwim-print (#151374) #11099

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

Open
wants to merge 1 commit into
base: swift/release/6.2
Choose a base branch
from
Open

[lldb] Fallback to expression eval when Dump of variable fails in dwim-print (#151374) #11099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 30 additions & 19 deletions lldb/source/Commands/CommandObjectDWIMPrint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@
#include "lldb/Target/MemoryRegionInfo.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/LLDBLog.h"
#include "lldb/Utility/Log.h"
#include "lldb/ValueObject/ValueObject.h"
#include "lldb/lldb-defines.h"
#include "lldb/lldb-enumerations.h"
#include "lldb/lldb-forward.h"
#include "lldb/lldb-types.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Error.h"

#include <regex>

Expand Down Expand Up @@ -134,27 +137,22 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
};

// Dump `valobj` according to whether `po` was requested or not.
auto dump_val_object = [&](ValueObject &valobj) {
auto dump_val_object = [&](ValueObject &valobj) -> Error {
if (is_po) {
StreamString temp_result_stream;
if (llvm::Error error = valobj.Dump(temp_result_stream, dump_options)) {
result.AppendError(toString(std::move(error)));
return;
}
if (Error err = valobj.Dump(temp_result_stream, dump_options))
return err;
llvm::StringRef output = temp_result_stream.GetString();
maybe_add_hint(output);
result.GetOutputStream() << output;
} else {
llvm::Error error =
valobj.Dump(result.GetOutputStream(), dump_options);
if (error) {
result.AppendError(toString(std::move(error)));
return;
}
if (Error err = valobj.Dump(result.GetOutputStream(), dump_options))
return err;
}
m_interpreter.PrintWarningsIfNecessary(result.GetOutputStream(),
m_cmd_name);
result.SetStatus(eReturnStatusSuccessFinishResult);
return Error::success();
};

// First, try `expr` as a _limited_ frame variable expression path: only the
Expand Down Expand Up @@ -188,8 +186,13 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
expr);
}

dump_val_object(*valobj_sp);
return;
Error err = dump_val_object(*valobj_sp);
if (!err)
return;

// Dump failed, continue on to expression evaluation.
LLDB_LOG_ERROR(GetLog(LLDBLog::Expressions), std::move(err),
"could not print frame variable '{1}': {0}", expr);
}
}

Expand Down Expand Up @@ -235,8 +238,14 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
if (auto *state = target.GetPersistentExpressionStateForLanguage(language))
if (auto var_sp = state->GetVariable(expr))
if (auto valobj_sp = var_sp->GetValueObject()) {
dump_val_object(*valobj_sp);
return;
Error err = dump_val_object(*valobj_sp);
if (!err)
return;

// Dump failed, continue on to expression evaluation.
LLDB_LOG_ERROR(GetLog(LLDBLog::Expressions), std::move(err),
"could not print persistent variable '{1}': {0}",
expr);
}

// Third, and lastly, try `expr` as a source expression to evaluate.
Expand Down Expand Up @@ -287,10 +296,12 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
result.AppendNoteWithFormatv("ran `expression {0}{1}`", flags, expr);
}

if (valobj_sp->GetError().GetError() != UserExpression::kNoResult)
dump_val_object(*valobj_sp);
else
result.SetStatus(eReturnStatusSuccessFinishResult);
if (valobj_sp->GetError().GetError() != UserExpression::kNoResult) {
if (Error err = dump_val_object(*valobj_sp))
result.SetError(std::move(err));
} else {
result.SetStatus(eReturnStatusSuccessFinishNoResult);
}

if (suppress_result)
if (auto result_var_sp =
Expand Down