Skip to content

Commit 9a88c2b

Browse files
committed
[lldb] Fixup tagged pointers ISAs
This patch upstreams support for tagger pointer ISAs.
1 parent cac9773 commit 9a88c2b

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,6 +2749,13 @@ AppleObjCRuntimeV2::TaggedPointerVendorRuntimeAssisted::GetClassDescriptor(
27492749
return nullptr;
27502750
actual_class_descriptor_sp =
27512751
m_runtime.GetClassDescriptorFromISA((ObjCISA)slot_data);
2752+
if (!actual_class_descriptor_sp) {
2753+
if (ABISP abi_sp = process->GetABI()) {
2754+
ObjCISA fixed_isa = abi_sp->FixCodeAddress((ObjCISA)slot_data);
2755+
actual_class_descriptor_sp =
2756+
m_runtime.GetClassDescriptorFromISA(fixed_isa);
2757+
}
2758+
}
27522759
if (!actual_class_descriptor_sp)
27532760
return ObjCLanguageRuntime::ClassDescriptorSP();
27542761
m_cache[slot] = actual_class_descriptor_sp;

0 commit comments

Comments
 (0)