Skip to content

[lldb] Simplify DumpValueObjectOptions::PointerDepth (NFC) #117504

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

Merged
merged 1 commit into from
Dec 3, 2024
Merged

[lldb] Simplify DumpValueObjectOptions::PointerDepth (NFC) #117504

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
10 changes: 4 additions & 6 deletions lldb/include/lldb/DataFormatters/DumpValueObjectOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ namespace lldb_private {
class DumpValueObjectOptions {
public:
struct PointerDepth {
enum class Mode { Always, Default, Never } m_mode;
uint32_t m_count;
uint32_t m_count = 0;

PointerDepth Decremented() const {
if (m_count > 0)
return PointerDepth{m_mode, m_count - 1};
return PointerDepth{m_mode, m_count};
return {m_count - 1};
return *this;
}

bool CanAllowExpansion() const;
Expand Down Expand Up @@ -65,8 +64,7 @@ class DumpValueObjectOptions {

DumpValueObjectOptions(ValueObject &valobj);

DumpValueObjectOptions &
SetMaximumPointerDepth(PointerDepth depth = {PointerDepth::Mode::Never, 0});
DumpValueObjectOptions &SetMaximumPointerDepth(uint32_t depth);

DumpValueObjectOptions &SetMaximumDepth(uint32_t depth, bool is_default);

Expand Down
10 changes: 4 additions & 6 deletions lldb/source/DataFormatters/DumpValueObjectOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ using namespace lldb;
using namespace lldb_private;

DumpValueObjectOptions::DumpValueObjectOptions()
: m_summary_sp(), m_root_valobj_name(),
m_max_ptr_depth(PointerDepth{PointerDepth::Mode::Default, 0}),
m_decl_printing_helper(), m_child_printing_decider(),
m_pointer_as_array(), m_use_synthetic(true),
: m_summary_sp(), m_root_valobj_name(), m_decl_printing_helper(),
m_child_printing_decider(), m_pointer_as_array(), m_use_synthetic(true),
m_scope_already_checked(false), m_flat_output(false), m_ignore_cap(false),
m_show_types(false), m_show_location(false), m_use_objc(false),
m_hide_root_type(false), m_hide_root_name(false), m_hide_name(false),
Expand All @@ -33,8 +31,8 @@ DumpValueObjectOptions::DumpValueObjectOptions(ValueObject &valobj)
}

DumpValueObjectOptions &
DumpValueObjectOptions::SetMaximumPointerDepth(PointerDepth depth) {
m_max_ptr_depth = depth;
DumpValueObjectOptions::SetMaximumPointerDepth(uint32_t depth) {
m_max_ptr_depth = {depth};
return *this;
}

Expand Down
9 changes: 1 addition & 8 deletions lldb/source/DataFormatters/ValueObjectPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,14 +503,7 @@ ValueObjectPrinter::PrintObjectDescriptionIfNeeded(bool value_printed,
}

bool DumpValueObjectOptions::PointerDepth::CanAllowExpansion() const {
switch (m_mode) {
case Mode::Always:
case Mode::Default:
return m_count > 0;
case Mode::Never:
return false;
}
return false;
return m_count > 0;
}

bool ValueObjectPrinter::ShouldPrintChildren(
Expand Down
3 changes: 1 addition & 2 deletions lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ DumpValueObjectOptions OptionGroupValueObjectDisplay::GetAsDumpOptions(
LanguageRuntimeDescriptionDisplayVerbosity lang_descr_verbosity,
lldb::Format format, lldb::TypeSummaryImplSP summary_sp) {
DumpValueObjectOptions options;
options.SetMaximumPointerDepth(
{DumpValueObjectOptions::PointerDepth::Mode::Always, ptr_depth});
options.SetMaximumPointerDepth(ptr_depth);
if (use_objc)
options.SetShowSummary(false);
else
Expand Down
Loading