Skip to content

[lldb] Return an llvm::Expected from DWARFExpression::Evaluate (NFCI) #94420

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 6 commits into from
Jun 5, 2024
Merged

[lldb] Return an llvm::Expected from DWARFExpression::Evaluate (NFCI) #94420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22bb28a
[Support] Add variadic createStringError overload (NFC)
JDevlieghere Jun 5, 2024
d5c288d
[lldb] Return an llvm::Expected from DWARFExpression::Evaluate (NFCI)
JDevlieghere Jun 5, 2024
b6e28ab
[lldb] Move LLDB_LOG_ERROR to correct else block
JDevlieghere Jun 5, 2024
aa51bea
[lldb] Improve DW_OP_entry_value error reporting
JDevlieghere Jun 5, 2024
9b69aee
Use inline comments
JDevlieghere Jun 5, 2024
d869f0b
Fix line wrapping in test
JDevlieghere Jun 5, 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
13 changes: 6 additions & 7 deletions lldb/include/lldb/Expression/DWARFExpression.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,12 @@ class DWARFExpression {
/// \return
/// True on success; false otherwise. If error_ptr is non-NULL,
/// details of the failure are provided through it.
static bool Evaluate(ExecutionContext *exe_ctx, RegisterContext *reg_ctx,
lldb::ModuleSP module_sp, const DataExtractor &opcodes,
const plugin::dwarf::DWARFUnit *dwarf_cu,
const lldb::RegisterKind reg_set,
const Value *initial_value_ptr,
const Value *object_address_ptr, Value &result,
Status *error_ptr);
static llvm::Expected<Value>
Evaluate(ExecutionContext *exe_ctx, RegisterContext *reg_ctx,
lldb::ModuleSP module_sp, const DataExtractor &opcodes,
const plugin::dwarf::DWARFUnit *dwarf_cu,
const lldb::RegisterKind reg_set, const Value *initial_value_ptr,
const Value *object_address_ptr);

static bool ParseDWARFLocationList(const plugin::dwarf::DWARFUnit *dwarf_cu,
const DataExtractor &data,
Expand Down
10 changes: 6 additions & 4 deletions lldb/include/lldb/Expression/DWARFExpressionList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#ifndef LLDB_EXPRESSION_DWARFEXPRESSIONLIST_H
#define LLDB_EXPRESSION_DWARFEXPRESSIONLIST_H

#include "lldb/Core/Value.h"
#include "lldb/Expression/DWARFExpression.h"
#include "lldb/Utility/RangeMap.h"
#include "lldb/lldb-private.h"
Expand Down Expand Up @@ -113,10 +114,11 @@ class DWARFExpressionList {

void SetModule(const lldb::ModuleSP &module) { m_module_wp = module; }

bool Evaluate(ExecutionContext *exe_ctx, RegisterContext *reg_ctx,
lldb::addr_t func_load_addr, const Value *initial_value_ptr,
const Value *object_address_ptr, Value &result,
Status *error_ptr) const;
llvm::Expected<Value> Evaluate(ExecutionContext *exe_ctx,
RegisterContext *reg_ctx,
lldb::addr_t func_load_addr,
const Value *initial_value_ptr,
const Value *object_address_ptr) const;

private:
// RangeDataVector requires a comparator for DWARFExpression, but it doesn't
Expand Down
8 changes: 6 additions & 2 deletions lldb/source/Core/ValueObjectVariable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,11 @@ bool ValueObjectVariable::UpdateValue() {
target);
}
Value old_value(m_value);
if (expr_list.Evaluate(&exe_ctx, nullptr, loclist_base_load_addr, nullptr,
nullptr, m_value, &m_error)) {
llvm::Expected<Value> maybe_value = expr_list.Evaluate(
&exe_ctx, nullptr, loclist_base_load_addr, nullptr, nullptr);

if (maybe_value) {
m_value = *maybe_value;
m_resolved_value = m_value;
m_value.SetContext(Value::ContextType::Variable, variable);

Expand Down Expand Up @@ -246,6 +249,7 @@ bool ValueObjectVariable::UpdateValue() {

SetValueIsValid(m_error.Success());
} else {
m_error = maybe_value.takeError();
// could not find location, won't allow editing
m_resolved_value.SetContext(Value::ContextType::Invalid, nullptr);
}
Expand Down
Loading
Loading