Skip to content

[lldb] Show value for libcxx and libstdcxx summary and remove pointer value in libcxx container summary #125294

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 4 commits into from
Feb 3, 2025
Merged

[lldb] Show value for libcxx and libstdcxx summary and remove pointer value in libcxx container summary #125294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbecf2f
[lldb] Show value for libcxx and libstdcxx summary and remove pointer…
ZequanWu Jan 31, 2025
0743f7b
format
ZequanWu Jan 31, 2025
6ad1718
format
ZequanWu Jan 31, 2025
ed0a48f
address comments
ZequanWu Feb 3, 2025
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
4 changes: 2 additions & 2 deletions lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ static void LoadLibCxxFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
.SetSkipPointers(false)
.SetSkipReferences(false)
.SetDontShowChildren(true)
.SetDontShowValue(true)
.SetDontShowValue(false)
.SetShowMembersOneLiner(false)
.SetHideItemNames(false);

Expand Down Expand Up @@ -1204,7 +1204,7 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
.SetSkipPointers(false)
.SetSkipReferences(false)
.SetDontShowChildren(true)
.SetDontShowValue(true)
.SetDontShowValue(false)
.SetShowMembersOneLiner(false)
.SetHideItemNames(false);

Expand Down
6 changes: 0 additions & 6 deletions lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,12 +430,6 @@ size_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::

bool lldb_private::formatters::LibcxxContainerSummaryProvider(
ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
if (valobj.IsPointerType()) {
uint64_t value = valobj.GetValueAsUnsigned(0);
if (!value)
return false;
stream.Printf("0x%016" PRIx64 " ", value);
}
return FormatEntity::FormatStringRef("size=${svar%#}", stream, nullptr,
nullptr, nullptr, &valobj, false, false);
}
Expand Down
33 changes: 19 additions & 14 deletions ...ionalities/data-formatter/data-formatter-stl/libcxx/deque/TestDataFormatterLibcxxDeque.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,27 @@


class LibcxxDequeDataFormatterTestCase(TestBase):
def check_numbers(self, var_name):
def check_numbers(self, var_name, show_ptr=False):
patterns = []
substrs = [
"[0] = 1",
"[1] = 12",
"[2] = 123",
"[3] = 1234",
"[4] = 12345",
"[5] = 123456",
"[6] = 1234567",
"}",
]
if show_ptr:
patterns = [var_name + " = 0x.* size=7"]
else:
substrs.insert(0, var_name + " = size=7")
self.expect(
"frame variable " + var_name,
substrs=[
var_name + " = size=7",
"[0] = 1",
"[1] = 12",
"[2] = 123",
"[3] = 1234",
"[4] = 12345",
"[5] = 123456",
"[6] = 1234567",
"}",
],
patterns=patterns,
substrs=substrs,
)

self.expect_expr(
var_name,
result_summary="size=7",
Expand Down Expand Up @@ -75,7 +80,7 @@ def test_ref_and_ptr(self):
)

# The reference should display the same was as the value did
self.check_numbers("ref")
self.check_numbers("ref", True)

# The pointer should just show the right number of elements:
self.expect("frame variable ptr", substrs=["ptr =", " size=7"])
Expand Down
5 changes: 1 addition & 4 deletions ...ctionalities/data-formatter/data-formatter-stl/libcxx/span/TestDataFormatterLibcxxSpan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,4 @@ def test_ref_and_ptr(self):

# The pointer should just show the right number of elements:

ptrAddr = self.findVariable("ptr").GetValue()
self.expect_expr(
"ptr", result_type="std::span<int, 5> *", result_summary=f"{ptrAddr} size=5"
)
self.expect("frame variable ptr", patterns=["ptr = 0x.*", " size=5"])
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SBValue::GetValue essentially uses the summary string provided by summary provider. So it returns "size=5" after I removed the pointer value in libcxx container summary.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense, but you can still use expect_expr to match this. You just need to say result_summary=re.compile("your_pattern")

2 changes: 1 addition & 1 deletion ...lities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_with_run_command(self):

self.expect(
"frame variable v1_ref",
substrs=["v1_ref = Active Type = int : {", "Value = 12", "}"],
patterns=["v1_ref = 0x.* Active Type = int : {", "Value = 12", "}"],
)

self.expect(
Expand Down
34 changes: 20 additions & 14 deletions ...nalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,28 @@


class LibcxxVectorDataFormatterTestCase(TestBase):
def check_numbers(self, var_name):
def check_numbers(self, var_name, show_ptr=False):
patterns = []
substrs = [
"[0] = 1",
"[1] = 12",
"[2] = 123",
"[3] = 1234",
"[4] = 12345",
"[5] = 123456",
"[6] = 1234567",
"}",
]
if show_ptr:
patterns = [var_name + " = 0x.* size=7"]
else:
substrs.insert(0, var_name + " = size=7")

self.expect(
"frame variable " + var_name,
substrs=[
var_name + " = size=7",
"[0] = 1",
"[1] = 12",
"[2] = 123",
"[3] = 1234",
"[4] = 12345",
"[5] = 123456",
"[6] = 1234567",
"}",
],
patterns=patterns,
substrs=substrs,
)

self.expect_expr(
var_name,
result_summary="size=7",
Expand Down Expand Up @@ -174,7 +180,7 @@ def test_ref_and_ptr(self):
)

# The reference should display the same was as the value did
self.check_numbers("ref")
self.check_numbers("ref", True)

# The pointer should just show the right number of elements:

Expand Down
2 changes: 1 addition & 1 deletion .../data-formatter/data-formatter-stl/libstdcpp/variant/TestDataFormatterLibStdcxxVariant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_with_run_command(self):
for name in ["v1_ref", "v1_typedef_ref"]:
self.expect(
"frame variable " + name,
substrs=[name + " = Active Type = int : {", "Value = 12", "}"],
patterns=[name + " = 0x.* Active Type = int : {", "Value = 12", "}"],
)

self.expect(
Expand Down