Author: Jonas Devlieghere Date: 2022-03-23T09:59:34-07:00 New Revision: 9a88c2b639411db37ad6fb37d144702df52694e8
URL: https://github.com/llvm/llvm-project/commit/9a88c2b639411db37ad6fb37d144702df52694e8 DIFF: https://github.com/llvm/llvm-project/commit/9a88c2b639411db37ad6fb37d144702df52694e8.diff LOG: [lldb] Fixup tagged pointers ISAs This patch upstreams support for tagger pointer ISAs. Added: Modified: lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 43dcb640d80a7..f3deafd3e2b68 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -2749,6 +2749,13 @@ AppleObjCRuntimeV2::TaggedPointerVendorRuntimeAssisted::GetClassDescriptor( return nullptr; actual_class_descriptor_sp = m_runtime.GetClassDescriptorFromISA((ObjCISA)slot_data); + if (!actual_class_descriptor_sp) { + if (ABISP abi_sp = process->GetABI()) { + ObjCISA fixed_isa = abi_sp->FixCodeAddress((ObjCISA)slot_data); + actual_class_descriptor_sp = + m_runtime.GetClassDescriptorFromISA(fixed_isa); + } + } if (!actual_class_descriptor_sp) return ObjCLanguageRuntime::ClassDescriptorSP(); m_cache[slot] = actual_class_descriptor_sp; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
