Skip to content

Reapply "[lldb] Convert file address to load address when reading memory for DW_OP_piece" #117168

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 3 commits into from
Nov 21, 2024
Merged

Reapply "[lldb] Convert file address to load address when reading memory for DW_OP_piece" #117168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b59a211
Convert file address to load address when reading memory for DW_OP_piece
kuilpd Nov 14, 2024
930bac5
Add a test
kuilpd Nov 15, 2024
ff7cd83
Move array usage to a separate function to ensure there is a breakpoi…
kuilpd Nov 20, 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
19 changes: 16 additions & 3 deletions lldb/source/Expression/DWARFExpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,12 +1853,25 @@ llvm::Expected<Value> DWARFExpression::Evaluate(
const Value::ValueType curr_piece_source_value_type =
curr_piece_source_value.GetValueType();
Scalar &scalar = curr_piece_source_value.GetScalar();
const lldb::addr_t addr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
lldb::addr_t addr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
switch (curr_piece_source_value_type) {
case Value::ValueType::Invalid:
return llvm::createStringError("invalid value type");
case Value::ValueType::LoadAddress:
case Value::ValueType::FileAddress: {
case Value::ValueType::FileAddress:
if (target) {
curr_piece_source_value.ConvertToLoadAddress(module_sp.get(),
target);
addr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
} else {
return llvm::createStringError(
"unable to convert file address 0x%" PRIx64
" to load address "
"for DW_OP_piece(%" PRIu64 "): "
"no target available",
addr, piece_byte_size);
}
[[fallthrough]];
case Value::ValueType::LoadAddress: {
if (target) {
if (curr_piece.ResizeData(piece_byte_size) == piece_byte_size) {
if (target->ReadMemory(addr, curr_piece.GetBuffer().GetBytes(),
Expand Down
26 changes: 26 additions & 0 deletions lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-O3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Check that optimized with -O3 values that have a file address can be read
// DWARF info:
// 0x00000023: DW_TAG_variable
// DW_AT_name ("array")
// DW_AT_type (0x00000032 "char[5]")
// DW_AT_location (DW_OP_piece 0x2, DW_OP_addrx 0x0, DW_OP_piece 0x1)

// RUN: %clang_host -O3 -gdwarf %s -o %t
// RUN: %lldb %t \
// RUN: -o "b 25" \
// RUN: -o "r" \
// RUN: -o "p/x array[2]" \
// RUN: -b | FileCheck %s
//
// CHECK: (lldb) p/x array[2]
// CHECK: (char) 0x03

static char array[5] = {0, 1, 2, 3, 4};

void func() __attribute__((noinline));
void func() { ++array[2]; };

int main(void) {
func();
return 0;
}
Loading