intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-21 04:14:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb] Fix value printing for a specific case

Browse Source 
Fixes printing of spaces in cases where the following are true:

  1. Persistent results are disabled
  2. The type has a summary string

As reported by @jgorbe in D146783, two spaces were being printed before the summary
string, and no spaces were printed after.

Differential Revision: https://reviews.llvm.org/D147006
This commit is contained in:
Dave Lee
2023-03-27 14:58:10 -07:00
parent c3613f3990
commit 51dd8a20c1
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/DataFormatters/ValueObjectPrinter.h
View File

@@ -98,7 +98,7 @@ protected:
ValueObject *GetValueObjectForChildrenGeneration();
void PrintChildrenPreamble();
void PrintChildrenPreamble(bool value_printed, bool summary_printed);
void PrintChildrenPostamble(bool print_dotdotdot);

11
lldb/source/DataFormatters/ValueObjectPrinter.cpp
View File

@@ -445,7 +445,9 @@ bool ValueObjectPrinter::PrintValueAndSummaryIfNeeded(bool &value_printed,
}
if (m_summary.size()) {
m_stream->Printf(" %s", m_summary.c_str());
if (ShouldShowName() || value_printed)
m_stream->PutChar(' ');
m_stream->PutCString(m_summary);
summary_printed = true;
}
}
@@ -560,7 +562,8 @@ ValueObject *ValueObjectPrinter::GetValueObjectForChildrenGeneration() {
return m_valobj;
}
void ValueObjectPrinter::PrintChildrenPreamble() {
void ValueObjectPrinter::PrintChildrenPreamble(bool value_printed,
bool summary_printed) {
if (m_options.m_flat_output) {
if (ShouldPrintValueObject())
m_stream->EOL();
@@ -568,7 +571,7 @@ void ValueObjectPrinter::PrintChildrenPreamble() {
if (ShouldPrintValueObject()) {
if (IsRef()) {
m_stream->PutCString(": ");
} else if (ShouldShowName()) {
} else if (value_printed || summary_printed || ShouldShowName()) {
m_stream->PutChar(' ');
}
m_stream->PutCString("{\n");
@@ -694,7 +697,7 @@ void ValueObjectPrinter::PrintChildren(
for (size_t idx = 0; idx < num_children; ++idx) {
if (ValueObjectSP child_sp = GenerateChild(synth_m_valobj, idx)) {
if (!any_children_printed) {
PrintChildrenPreamble();
PrintChildrenPreamble(value_printed, summary_printed);
any_children_printed = true;
}
PrintChild(child_sp, curr_ptr_depth);

9
lldb/test/API/commands/dwim-print/TestDWIMPrint.py
View File

@@ -122,3 +122,12 @@ class TestCase(TestBase):
self.runCmd("settings set auto-one-line-summaries false")
self._expect_cmd(f"dwim-print s", "frame variable")
self._expect_cmd(f"dwim-print (struct Structure)s", "expression")
def test_summary_strings(self):
"""Test dwim-print with nested values (structs, etc)."""
self.build()
lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.c"))
self.runCmd("settings set auto-one-line-summaries false")
self.runCmd("type summary add -e -s 'stub summary' Structure")
self._expect_cmd(f"dwim-print s", "frame variable")
self._expect_cmd(f"dwim-print (struct Structure)s", "expression")