Author: enrico
Date: Tue Sep 10 16:04:54 2013
New Revision: 190436
URL: http://llvm.org/viewvc/llvm-project?rev=190436&view=rev
Log:
<rdar://problem/14071463>
The wrong method was being called in some instances here, causing class lookups
to fail
Modified:
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
Modified:
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=190436&r1=190435&r2=190436&view=diff
==============================================================================
---
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
(original)
+++
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
Tue Sep 10 16:04:54 2013
@@ -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 (
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::TaggedPointerVendorR
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;
Modified:
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h?rev=190436&r1=190435&r2=190436&view=diff
==============================================================================
---
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
(original)
+++
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
Tue Sep 10 16:04:54 2013
@@ -97,7 +97,7 @@ public:
GetClassDescriptor (ValueObject& in_value);
virtual ClassDescriptorSP
- GetClassDescriptor (ObjCISA isa);
+ GetClassDescriptorFromISA (ObjCISA isa);
virtual TypeVendor *
GetTypeVendor();
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
