Skip to content

[LLDB] Fix ValueObject::AddressOf() return value #137688

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
May 5, 2025
Merged

[LLDB] Fix ValueObject::AddressOf() return value #137688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5108154
[LLDB] Fix `ValueObject::AddressOf()` return value
kuilpd Apr 28, 2025
f9366fb
Disable clang-format for inline tests
kuilpd Apr 30, 2025
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
7 changes: 5 additions & 2 deletions lldb/source/ValueObject/ValueObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2966,10 +2966,13 @@ ValueObjectSP ValueObject::AddressOf(Status &error) {
std::string name(1, '&');
name.append(m_name.AsCString(""));
ExecutionContext exe_ctx(GetExecutionContextRef());

lldb::DataBufferSP buffer(
new lldb_private::DataBufferHeap(&addr, sizeof(lldb::addr_t)));
m_addr_of_valobj_sp = ValueObjectConstResult::Create(
exe_ctx.GetBestExecutionContextScope(),
compiler_type.GetPointerType(), ConstString(name.c_str()), addr,
eAddressTypeInvalid, m_data.GetAddressByteSize());
compiler_type.GetPointerType(), ConstString(name.c_str()), buffer,
endian::InlHostByteOrder(), exe_ctx.GetAddressByteSize());
}
} break;
default:
Expand Down
47 changes: 25 additions & 22 deletions lldb/test/API/python_api/sbvalue_const_addrof/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

struct RegisterContext
{
uintptr_t r0;
uintptr_t r1;
uintptr_t r2;
uintptr_t r3;
uintptr_t r4;
uintptr_t pc;
uintptr_t fp;
uintptr_t sp;
uintptr_t r0;
uintptr_t r1;
uintptr_t r2;
uintptr_t r3;
uintptr_t r4;
uintptr_t pc;
uintptr_t fp;
uintptr_t sp;
};

struct ThreadInfo {
uint32_t tid;
const char *name;
RegisterContext regs;
ThreadInfo *next;
uint32_t tid;
const char *name;
RegisterContext regs;
ThreadInfo *next;
};
int main (int argc, char const *argv[], char const *envp[]);

Expand All @@ -27,14 +27,17 @@ ThreadInfo *g_thread_list_ptr = &g_thread1;

int main (int argc, char const *argv[], char const *envp[])
{
printf ("g_thread_list is %p\n", g_thread_list_ptr);
return 0; //% v = self.dbg.GetSelectedTarget().FindFirstGlobalVariable('g_thread_list_ptr')
//% v_gla = v.GetChildMemberWithName('regs').GetLoadAddress()
//% v_aof = v.GetChildMemberWithName('regs').AddressOf().GetValueAsUnsigned(lldb.LLDB_INVALID_ADDRESS)
//% expr = '(%s)0x%x' % (v.GetType().GetName(), v.GetValueAsUnsigned(0))
//% e = v.CreateValueFromExpression('e', expr)
//% e_gla = e.GetChildMemberWithName('regs').GetLoadAddress()
//% e_aof = e.GetChildMemberWithName('regs').AddressOf().GetValueAsUnsigned(lldb.LLDB_INVALID_ADDRESS)
//% self.assertTrue(v_gla == e_gla, "GetLoadAddress() differs")
//% self.assertTrue(v_aof == e_aof, "AddressOf() differs")
// clang-format off
printf ("g_thread_list is %p\n", g_thread_list_ptr);
return 0; //% v = self.dbg.GetSelectedTarget().FindFirstGlobalVariable('g_thread_list_ptr')
//% self.assertTrue(v.AddressOf().IsValid())
//% self.assertFalse(v.AddressOf().AddressOf().IsValid())
//% v_gla = v.GetChildMemberWithName('regs').GetLoadAddress()
//% v_aof = v.GetChildMemberWithName('regs').AddressOf().GetValueAsUnsigned(lldb.LLDB_INVALID_ADDRESS)
//% expr = '(%s)0x%x' % (v.GetType().GetName(), v.GetValueAsUnsigned(0))
//% e = v.CreateValueFromExpression('e', expr)
//% e_gla = e.GetChildMemberWithName('regs').GetLoadAddress()
//% e_aof = e.GetChildMemberWithName('regs').AddressOf().GetValueAsUnsigned(lldb.LLDB_INVALID_ADDRESS)
//% self.assertTrue(v_gla == e_gla, "GetLoadAddress() differs")
//% self.assertTrue(v_aof == e_aof, "AddressOf() differs")
}
Loading