Skip to content

Commit f5d024b

Browse files
committed
[lldb] Fixup tagged pointers ISAs
This patch upstreams support for tagger pointer ISAs. (cherry picked from commit 9a88c2b)
1 parent 7fdf3d7 commit f5d024b

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
@@ -2762,6 +2762,13 @@ AppleObjCRuntimeV2::TaggedPointerVendorRuntimeAssisted::GetClassDescriptor(
27622762
return nullptr;
27632763
actual_class_descriptor_sp =
27642764
m_runtime.GetClassDescriptorFromISA((ObjCISA)slot_data);
2765+
if (!actual_class_descriptor_sp) {
2766+
if (ABISP abi_sp = process->GetABI()) {
2767+
ObjCISA fixed_isa = abi_sp->FixCodeAddress((ObjCISA)slot_data);
2768+
actual_class_descriptor_sp =
2769+
m_runtime.GetClassDescriptorFromISA(fixed_isa);
2770+
}
2771+
}
27652772
if (!actual_class_descriptor_sp)
27662773
return ObjCLanguageRuntime::ClassDescriptorSP();
27672774
m_cache[slot] = actual_class_descriptor_sp;

0 commit comments

Comments
 (0)