Author: enrico
Date: Thu Mar 12 17:16:20 2015
New Revision: 232113
URL: http://llvm.org/viewvc/llvm-project?rev=232113&view=rev
Log:
Fix an issue where values would be printed in one-line mode even if you asked
to see locations and/or asked for flat output mode
Modified:
lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp
Modified: lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp?rev=232113&r1=232112&r2=232113&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp (original)
+++ lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp Thu Mar 12 17:16:20
2015
@@ -631,7 +631,11 @@ ValueObjectPrinter::PrintChildrenIfNeede
uint32_t curr_ptr_depth = m_ptr_depth;
bool print_children = ShouldPrintChildren
(is_failed_description,curr_ptr_depth);
- bool print_oneline = (curr_ptr_depth > 0 || options.m_show_types ||
!options.m_allow_oneliner_mode) ? false :
DataVisualization::ShouldPrintAsOneLiner(*m_valobj);
+ bool print_oneline = (curr_ptr_depth > 0 ||
+ options.m_show_types ||
+ !options.m_allow_oneliner_mode ||
+ options.m_flat_output ||
+ options.m_show_location) ? false :
DataVisualization::ShouldPrintAsOneLiner(*m_valobj);
if (print_children)
{
_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
