maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

<rdar://problem/14071463> 

The wrong method was being called in some instances here, causing class lookups to fail

llvm-svn: 190436
This commit is contained in:
Enrico Granata 2013-09-10 21:04:54 +00:00
parent 4e6bec7e26
commit 1ea6f1e7f9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
View File

@ -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;

2
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
View File

@ -97,7 +97,7 @@ public:
GetClassDescriptor (ValueObject& in_value);
virtual ClassDescriptorSP
GetClassDescriptor (ObjCISA isa);
GetClassDescriptorFromISA (ObjCISA isa);
virtual TypeVendor *
GetTypeVendor();