When deciding if one-liner printing applies, and you find a summary, the summary is a good candidate to ask. While in theory one could want one-liner printing with a non-one-liner summary, I don't see LLDB as the best place to solve such inner conflicts

llvm-svn: 217641
This commit is contained in:
Enrico Granata 2014-09-11 23:00:27 +00:00
parent 56ab746c07
commit 42fa4af8fe
1 changed files with 2 additions and 3 deletions

View File

@ -527,10 +527,9 @@ FormatManager::ShouldPrintAsOneLiner (ValueObject& valobj)
if (valobj.GetTargetSP().get() && valobj.GetTargetSP()->GetDebugger().GetAutoOneLineSummaries() == false)
return false; // then don't oneline
// if this object has a summary, don't try to do anything special to it
// if the user wants one-liner, they can ask for it in summary :)
// if this object has a summary, then ask the summary
if (valobj.GetSummaryFormat().get() != nullptr)
return false;
return valobj.GetSummaryFormat()->IsOneLiner();
// no children, no party
if (valobj.GetNumChildren() == 0)