[Lldb-commits] [lldb] r169809 - /lldb/trunk/source/Core/ValueObject.cpp

[Enrico Granata]

Author: enrico
Date: Mon Dec 10 20:17:22 2012
New Revision: 169809

URL: http://llvm.org/viewvc/llvm-project?rev=169809&view=rev
Log:
<rdar://problem/12639506> 

Make sure that the user's choice of a format for dumping aggregate types is persisted to child members


Modified:
    lldb/trunk/source/Core/ValueObject.cpp

Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=169809&r1=169808&r2=169809&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Mon Dec 10 20:17:22 2012
@@ -1242,7 +1242,7 @@
     if (UpdateValueIfNeeded(true) && m_value_str.empty())
     {
         lldb::Format my_format = GetFormat();
-        if (m_format == lldb::eFormatDefault)
+        if (my_format == lldb::eFormatDefault)
         {
             if (m_type_format_sp)
                 my_format = m_type_format_sp->GetFormat();
@@ -3428,7 +3428,7 @@
                         }
 
                         ValueObject::DumpValueObjectOptions child_options(options);
-                        child_options.SetFormat().SetSummary().SetRootValueObjectName();
+                        child_options.SetFormat(options.m_format).SetSummary().SetRootValueObjectName();
                         child_options.SetScopeChecked(true)
                         .SetOmitSummaryDepth(child_options.m_omit_summary_depth > 1 ? child_options.m_omit_summary_depth - 1 : 0);
                         for (uint32_t idx=0; idx<num_children; ++idx)