Skip to content

Commit de6d168

Browse files
authored
Revert "[lldb] Convert file address to load address when reading memory for DW_OP_piece" (#116824)
Reverts #116411
1 parent 64e3466 commit de6d168

File tree

2 files changed

+3
-39
lines changed

2 files changed

+3
-39
lines changed

lldb/source/Expression/DWARFExpression.cpp

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,25 +1853,12 @@ llvm::Expected<Value> DWARFExpression::Evaluate(
18531853
const Value::ValueType curr_piece_source_value_type =
18541854
curr_piece_source_value.GetValueType();
18551855
Scalar &scalar = curr_piece_source_value.GetScalar();
1856-
lldb::addr_t addr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
1856+
const lldb::addr_t addr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
18571857
switch (curr_piece_source_value_type) {
18581858
case Value::ValueType::Invalid:
18591859
return llvm::createStringError("invalid value type");
1860-
case Value::ValueType::FileAddress:
1861-
if (target) {
1862-
curr_piece_source_value.ConvertToLoadAddress(module_sp.get(),
1863-
target);
1864-
addr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
1865-
} else {
1866-
return llvm::createStringError(
1867-
"unable to convert file address 0x%" PRIx64
1868-
" to load address "
1869-
"for DW_OP_piece(%" PRIu64 "): "
1870-
"no target available",
1871-
addr, piece_byte_size);
1872-
}
1873-
[[fallthrough]];
1874-
case Value::ValueType::LoadAddress: {
1860+
case Value::ValueType::LoadAddress:
1861+
case Value::ValueType::FileAddress: {
18751862
if (target) {
18761863
if (curr_piece.ResizeData(piece_byte_size) == piece_byte_size) {
18771864
if (target->ReadMemory(addr, curr_piece.GetBuffer().GetBytes(),

lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-O3.c

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)