diff options
| author | Enrico Granata <egranata@apple.com> | 2013-09-10 21:04:54 +0000 |
|---|---|---|
| committer | Enrico Granata <egranata@apple.com> | 2013-09-10 21:04:54 +0000 |
| commit | 1ea6f1e7f9029960842969374ba3b06f416a3df9 (patch) | |
| tree | aa9a18cd0b8767b9181eeccd775a29e4b644c3e7 | |
| parent | 4e6bec7e26f676ac93bcb3c1324b38be29deebab (diff) | |
| download | bcm5719-llvm-1ea6f1e7f9029960842969374ba3b06f416a3df9.tar.gz bcm5719-llvm-1ea6f1e7f9029960842969374ba3b06f416a3df9.zip | |
<rdar://problem/14071463>
The wrong method was being called in some instances here, causing class lookups to fail
llvm-svn: 190436
| -rw-r--r-- | lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 23a0e23e7c5..9012dd67281 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -1596,7 +1596,7 @@ private: }; ObjCLanguageRuntime::ClassDescriptorSP -AppleObjCRuntimeV2::GetClassDescriptor (ObjCISA isa) +AppleObjCRuntimeV2::GetClassDescriptorFromISA (ObjCISA isa) { ObjCLanguageRuntime::ClassDescriptorSP class_descriptor_sp; if (m_non_pointer_isa_cache_ap.get()) @@ -1633,7 +1633,7 @@ AppleObjCRuntimeV2::GetClassDescriptor (ValueObject& valobj) ObjCISA isa = process->ReadPointerFromMemory(isa_pointer, error); if (isa != LLDB_INVALID_ADDRESS) { - objc_class_sp = ObjCLanguageRuntime::GetClassDescriptorFromISA (isa); + objc_class_sp = GetClassDescriptorFromISA (isa); if (isa && !objc_class_sp) { Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS)); @@ -2598,7 +2598,7 @@ AppleObjCRuntimeV2::TaggedPointerVendorRuntimeAssisted::GetClassDescriptor (lldb uintptr_t slot_data = process->ReadPointerFromMemory(slot_ptr, error); if (error.Fail() || slot_data == 0 || slot_data == LLDB_INVALID_ADDRESS) return nullptr; - actual_class_descriptor_sp = m_runtime.GetClassDescriptor(slot_data); + actual_class_descriptor_sp = m_runtime.GetClassDescriptorFromISA((ObjCISA)slot_data); if (!actual_class_descriptor_sp) return ObjCLanguageRuntime::ClassDescriptorSP(); m_cache[slot] = actual_class_descriptor_sp; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h index 54cc3b86b1a..5ee73400f7e 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h @@ -97,7 +97,7 @@ public: GetClassDescriptor (ValueObject& in_value); virtual ClassDescriptorSP - GetClassDescriptor (ObjCISA isa); + GetClassDescriptorFromISA (ObjCISA isa); virtual TypeVendor * GetTypeVendor(); |
