Skip to content

Update swift language plugin's address mask handling #8378

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 1 commit into from
Mar 12, 2024
Merged

Update swift language plugin's address mask handling #8378

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
8 changes: 2 additions & 6 deletions lldb/source/Plugins/LanguageRuntime/Swift/LLDBMemoryReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ bool LLDBMemoryReader::queryDataLayout(DataLayoutQueryType type, void *inBuffer,
void *outBuffer) {
switch (type) {
case DLQ_GetPtrAuthMask: {
// The MemoryReader API doesn't distinguish between the two, so
// this configuration is not yet supported.
if (m_process.GetCodeAddressMask() != m_process.GetDataAddressMask())
return false;
lldb::addr_t ptrauth_mask = m_process.GetCodeAddressMask();
if (!ptrauth_mask)
lldb::addr_t ptrauth_mask = m_process.GetDataAddressMask();
if (ptrauth_mask == LLDB_INVALID_ADDRESS_MASK)
return false;
// The mask returned by the process masks out the non-addressable bits.
uint64_t mask_pattern = ~ptrauth_mask;
Expand Down