Some descriptive text for the Python script feature:

 - help type summary add now gives some hints on how to use it
frame variable and target variable now have a --no-summary-depth (-Y) option:
 - simply using -Y without an argument will skip one level of summaries, i.e.
   your aggregate types will expand their children and display no summary, even
   if they have one. children will behave normally
 - using -Y<int>, as in -Y4, -Y7, ..., will skip as many levels of summaries as
   given by the <int> parameter (obviously, -Y and -Y1 are the same thing). children
   beneath the given depth level will behave normally
 -Y0 is the same as omitting the --no-summary-depth parameter entirely
 This option replaces the defined-but-unimplemented --no-summary

llvm-svn: 135336

1 files changed, 8 insertions, 3 deletions

diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 5264db2c4cb..4f0c8dc9069 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -2398,7 +2398,8 @@ ValueObject::DumpValueObject
     bool use_objc,
     lldb::DynamicValueType use_dynamic,
     bool scope_already_checked,
-    bool flat_output
+    bool flat_output,
+    uint32_t omit_summary_depth
 )
 {
     if (valobj)
@@ -2458,6 +2459,9 @@ ValueObject::DumpValueObject
         const char *sum_cstr = NULL;
         SummaryFormat* entry = valobj->GetSummaryFormat().get();
         
+        if (omit_summary_depth > 0)
+            entry = NULL;
+        
         if (err_cstr == NULL)
         {
             val_cstr = valobj->GetValueAsCString();
@@ -2474,7 +2478,7 @@ ValueObject::DumpValueObject
             if (print_valobj)
             {
                 
-                sum_cstr = valobj->GetSummaryAsCString();
+                sum_cstr = (omit_summary_depth == 0) ? valobj->GetSummaryAsCString() : NULL;
 
                 // We must calculate this value in realtime because entry might alter this variable's value
                 // (e.g. by saying ${var%fmt}) and render precached values useless
@@ -2571,7 +2575,8 @@ ValueObject::DumpValueObject
                                                  false,
                                                  use_dynamic,
                                                  true,
-                                                 flat_output);
+                                                 flat_output,
+                                                 omit_summary_depth > 1 ? omit_summary_depth - 1 : 0);
                             }
                         }