Revert r239873 - I actually want to think some more about this

llvm-svn: 239874

diff --git a/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h b/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h
index 847b39e..dc05fd4 100644 (file)
--- a/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h
+++ b/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h
@@ -22,8 +22,6 @@
 #include "lldb/Core/ValueObject.h"
 #include "lldb/DataFormatters/TypeSummary.h"
 
-#include "llvm/ADT/Optional.h"
-
 namespace lldb_private {
 
 struct DumpValueObjectOptions
@@ -373,9 +371,6 @@ protected:
     bool
     PrintChildrenOneLiner (bool hide_names);
     
-    lldb::Format
-    GetFormatForChildElements ();
-    
 private:
     
     ValueObject *m_orig_valobj;
@@ -396,7 +391,6 @@ private:
     std::string m_summary;
     std::string m_error;
     std::pair<TypeValidatorResult,std::string> m_validation;
-    llvm::Optional<lldb::Format> m_children_format;
     
     friend struct StringSummaryFormat;
     

diff --git a/lldb/source/DataFormatters/ValueObjectPrinter.cpp b/lldb/source/DataFormatters/ValueObjectPrinter.cpp
index 822c25b..7c794ee 100644 (file)
--- a/lldb/source/DataFormatters/ValueObjectPrinter.cpp
+++ b/lldb/source/DataFormatters/ValueObjectPrinter.cpp
@@ -83,7 +83,6 @@ ValueObjectPrinter::Init (ValueObject* valobj,
     m_value.assign("");
     m_summary.assign("");
     m_error.assign("");
-    m_children_format.reset();
 }
 
 bool
@@ -503,25 +502,12 @@ ValueObjectPrinter::PrintChildrenPreamble ()
     }
 }
 
-lldb::Format
-ValueObjectPrinter::GetFormatForChildElements ()
-{
-    // we special case vector types here because for a vector type the format is not trivially passed down but is one of the things
-    // the synthetic child provider uses to decide how to produce children in the first place - in general this might be something
-    // we'd want to expose in some cleaner way, but until there is more than one instance of this, it's hard to design this capability
-    // in a sensible way, so for now, leave this alone as a special case
-    if (m_children_format.hasValue())
-        return m_children_format.getValue();
-    
-    return (m_children_format = m_clang_type.IsVectorType(nullptr, nullptr) ? lldb::eFormatInvalid : options.m_format).getValue();
-}
-
 void
 ValueObjectPrinter::PrintChild (ValueObjectSP child_sp,
                                 uint32_t curr_ptr_depth)
 {
     DumpValueObjectOptions child_options(options);
-    child_options.SetFormat(GetFormatForChildElements()).SetSummary().SetRootValueObjectName();
+    child_options.SetFormat(options.m_format).SetSummary().SetRootValueObjectName();
     child_options.SetScopeChecked(true).SetHideName(options.m_hide_name).SetHideValue(options.m_hide_value)
     .SetOmitSummaryDepth(child_options.m_omit_summary_depth > 1 ? child_options.m_omit_summary_depth - 1 : 0);
     if (child_sp.get())
@@ -644,7 +630,7 @@ ValueObjectPrinter::PrintChildrenOneLiner (bool hide_names)
                 }
                 child_sp->DumpPrintableRepresentation(*m_stream,
                                                       ValueObject::eValueObjectRepresentationStyleSummary,
-                                                      GetFormatForChildElements(),
+                                                      lldb::eFormatInvalid,
                                                       ValueObject::ePrintableRepresentationSpecialCasesDisable);
             }
         }

diff --git a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
index 816f877..c4fd55f 100644 (file)
--- a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
+++ b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
@@ -83,9 +83,6 @@ class FormatPropagationTestCase(TestBase):
         Y.SetFormat(lldb.eFormatDefault)
         self.assertTrue(X.GetValue() == "0x00000004", "X is not hex as it asked")
         self.assertTrue(Y.GetValue() == "2", "Y is not defaulted")
-        
-        # check that 'frame variable' propagates the format correctly
-        self.expect('frame variable -f x', substrs=['0x00000004', '0x00000002'])
 
 if __name__ == '__main__':
     import atexit

diff --git a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
index cc2a7a0..14cc63f 100644 (file)
--- a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
+++ b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
@@ -71,7 +71,6 @@ class VectorTypesFormattingTestCase(TestBase):
         
         self.expect("expr -f int16_t[] -- v", substrs=['[0] = 0', '[1] = 16288', '[2] = 0', '[3] = 16288', '[4] = 0', '[5] = 16416', '[6] = 0', '[7] = 16416'])
         self.expect("expr -f uint128_t[] -- v", substrs=['[0] = 85236745249553456609335044694184296448'])
-        self.expect("expr -f x -- v", substrs=['[0] = 0x3fa00000', '[3] = 0x40200000'])
         
         oldValue = v.GetChildAtIndex(0).GetValue()
         v.SetFormat(lldb.eFormatHex)