From 3fa6dc904a58c8433add5576025e48eab8cbad10 Mon Sep 17 00:00:00 2001 From: Enrico Granata Date: Thu, 12 Mar 2015 22:16:20 +0000 Subject: 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 llvm-svn: 232113 --- lldb/source/DataFormatters/ValueObjectPrinter.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lldb/source/DataFormatters/ValueObjectPrinter.cpp') diff --git a/lldb/source/DataFormatters/ValueObjectPrinter.cpp b/lldb/source/DataFormatters/ValueObjectPrinter.cpp index 5560ce2971e..8fd627020bc 100644 --- a/lldb/source/DataFormatters/ValueObjectPrinter.cpp +++ b/lldb/source/DataFormatters/ValueObjectPrinter.cpp @@ -631,7 +631,11 @@ ValueObjectPrinter::PrintChildrenIfNeeded (bool value_printed, 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) { -- cgit v1.2.3