Skip to content

Commit 8c5ad1a

Browse files
authored
Merge pull request #8378 from jasonmolenda/update-swift-plugin-mask-support
Update swift language plugin's address mask handling
2 parents c298691 + 4630642 commit 8c5ad1a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

lldb/source/Plugins/LanguageRuntime/Swift/LLDBMemoryReader.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ bool LLDBMemoryReader::queryDataLayout(DataLayoutQueryType type, void *inBuffer,
2727
void *outBuffer) {
2828
switch (type) {
2929
case DLQ_GetPtrAuthMask: {
30-
// The MemoryReader API doesn't distinguish between the two, so
31-
// this configuration is not yet supported.
32-
if (m_process.GetCodeAddressMask() != m_process.GetDataAddressMask())
33-
return false;
34-
lldb::addr_t ptrauth_mask = m_process.GetCodeAddressMask();
35-
if (!ptrauth_mask)
30+
lldb::addr_t ptrauth_mask = m_process.GetDataAddressMask();
31+
if (ptrauth_mask == LLDB_INVALID_ADDRESS_MASK)
3632
return false;
3733
// The mask returned by the process masks out the non-addressable bits.
3834
uint64_t mask_pattern = ~ptrauth_mask;

0 commit comments

Comments
 (0)