Skip to content

[lldb] Use summary string for ObjectiveC.Selector (NFC) #7194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: stable/20230725
Choose a base branch
from
Open

[lldb] Use summary string for ObjectiveC.Selector (NFC) #7194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,33 +779,6 @@ lldb_private::formatters::swift::EnumSyntheticFrontEndCreator(
return (new EnumSyntheticFrontEnd(valobj_sp));
}

bool lldb_private::formatters::swift::ObjC_Selector_SummaryProvider(
ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
LLDB_SCOPED_TIMER();
static ConstString g_ptr("ptr");
static ConstString g__rawValue("_rawValue");

ValueObjectSP ptr_sp(valobj.GetChildAtNamePath({g_ptr, g__rawValue}));
if (!ptr_sp)
return false;

auto ptr_value = ptr_sp->GetValueAsUnsigned(LLDB_INVALID_ADDRESS);

if (0 == ptr_value || LLDB_INVALID_ADDRESS == ptr_value)
return false;

StringPrinter::ReadStringAndDumpToStreamOptions read_options;
read_options.SetLocation(ptr_value);
read_options.SetTargetSP(valobj.GetTargetSP());
read_options.SetStream(&stream);
read_options.SetQuote('"');
read_options.SetNeedsZeroTermination(true);
read_options.SetEscapeStyle(StringPrinter::EscapeStyle::Swift);

return StringPrinter::ReadStringAndDumpToStream<
StringPrinter::StringElementType::ASCII>(read_options);
}

template <int Key> struct TypePreservingNSNumber;

template <> struct TypePreservingNSNumber<0> {
Expand Down
3 changes: 0 additions & 3 deletions lldb/source/Plugins/Language/Swift/SwiftFormatters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ bool GLKit_SummaryProvider(ValueObject &valobj, Stream &stream,
bool BuiltinObjC_SummaryProvider(ValueObject &valobj, Stream &stream,
const TypeSummaryOptions &options);

bool ObjC_Selector_SummaryProvider(ValueObject &valobj, Stream &stream,
const TypeSummaryOptions &options);

bool TypePreservingNSNumber_SummaryProvider(ValueObject &valobj, Stream &stream,
const TypeSummaryOptions &options);

Expand Down
6 changes: 2 additions & 4 deletions lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,8 @@ static void LoadSwiftFormatters(lldb::TypeCategoryImplSP swift_category_sp) {
basic_synth_flags.SetCascades(true).SetSkipPointers(true).SetSkipReferences(
true);

AddCXXSummary(swift_category_sp,
lldb_private::formatters::swift::ObjC_Selector_SummaryProvider,
"ObjectiveC.Selector", ConstString("ObjectiveC.Selector"),
summary_flags);
AddStringSummary(swift_category_sp, "${var.ptr._rawValue%s}",
ConstString("ObjectiveC.Selector"), summary_flags);

AddCXXSynthetic(
swift_category_sp,
Expand Down