This is an archive of the discontinued LLVM Phabricator instance.

Differential D87545

[lldb] Use GetNonKVOClassDescriptor to get the NSDictionary class descriptor
ClosedPublic

Authored by JDevlieghere on Sep 11 2020, 12:43 PM.

Details

Reviewers
jingham
Commits
rG33eb64704292: [lldb] Use GetNonKVOClassDescriptor to get the NSDictionary class descriptor
Summary

On macOS Big Sur the class descriptor contains the NSKVONotifying_ prefix. This is covered by TestDataFormatterObjCKVO.

Diff Detail

Event Timeline

JDevlieghere requested review of this revision.Sep 11 2020, 12:43 PM
JDevlieghere created this revision.
JDevlieghere updated this revision to Diff 291325.Sep 11 2020, 1:23 PM

Remove spurious change

jingham accepted this revision.Sep 11 2020, 4:50 PM

LGTM. The KVO decorated class name is almost never useful, and certainly not here...

This revision is now accepted and ready to land.Sep 11 2020, 4:50 PM
Closed by commit rG33eb64704292: [lldb] Use GetNonKVOClassDescriptor to get the NSDictionary class descriptor (authored by JDevlieghere). · Explain WhySep 11 2020, 5:37 PM
This revision was automatically updated to reflect the committed changes.
JDevlieghere added a commit: rG33eb64704292: [lldb] Use GetNonKVOClassDescriptor to get the NSDictionary class descriptor.
Herald added a project: Restricted Project. · View Herald TranscriptSep 11 2020, 5:37 PM

Revision Contents

PathSize
lldb/
source/
Plugins/
Language/
ObjC/
2 lines

Diff 291362

lldb/source/Plugins/Language/ObjC/NSDictionary.cpp

Show First 20 Lines • Show All 382 Lines • ▼ Show 20 Lines if (!process_sp)
return false; return false;
ObjCLanguageRuntime *runtime = ObjCLanguageRuntime::Get(*process_sp); ObjCLanguageRuntime *runtime = ObjCLanguageRuntime::Get(*process_sp);
if (!runtime) if (!runtime)
return false; return false;
ObjCLanguageRuntime::ClassDescriptorSP descriptor( ObjCLanguageRuntime::ClassDescriptorSP descriptor(
runtime->GetClassDescriptor(valobj)); runtime->GetNonKVOClassDescriptor(valobj));
if (!descriptor || !descriptor->IsValid()) if (!descriptor || !descriptor->IsValid())
return false; return false;
uint32_t ptr_size = process_sp->GetAddressByteSize(); uint32_t ptr_size = process_sp->GetAddressByteSize();
bool is_64bit = (ptr_size == 8); bool is_64bit = (ptr_size == 8);
lldb::addr_t valobj_addr = valobj.GetValueAsUnsigned(0); lldb::addr_t valobj_addr = valobj.GetValueAsUnsigned(0);
▲ Show 20 Lines • Show All 834 Lines • Show Last 20 Lines