commit 7c0788b2d91bdbaa5d58fb96234fd153c18c293c
author Enrico Granata <egranata@apple.com> Tue Mar 26 18:55:08 2013 +0000
committer Enrico Granata <egranata@apple.com> Tue Mar 26 18:55:08 2013 +0000
tree e47363e9cbe3b3fa6ce212d1a1da10540ada6149
parent bb1beaa220a6f5b21a1ed82515fba92d779de757

Data formatters cleanup:
- Making an error message more consistent
- Ensuring the element size is not zero before using it in a modulus
- Properly using target settings to cap the std::list element count
- Removing spurious element size calculations that were unused
- Removing spurious capping in std::map

llvm-svn: 178057

lldb/source/DataFormatters/LibCxxList.cpp

diff --git a/lldb/source/DataFormatters/LibCxxList.cpp b/lldb/source/DataFormatters/LibCxxList.cpp
index 7bedd8f..574d161 100644
--- a/lldb/source/DataFormatters/LibCxxList.cpp
+++ b/lldb/source/DataFormatters/LibCxxList.cpp
@@ -142,11 +142,11 @@
 
 lldb_private::formatters::LibcxxStdListSyntheticFrontEnd::LibcxxStdListSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
 SyntheticChildrenFrontEnd(*valobj_sp.get()),
+m_list_capping_size(0),
 m_node_address(),
 m_head(NULL),
 m_tail(NULL),
 m_element_type(),
-m_element_size(0),
 m_count(UINT32_MAX),
 m_children()
 {
@@ -197,7 +197,7 @@
     {
         size++;
         current.SetEntry(current.next());
-        if (size > g_list_capping_size)
+        if (size > m_list_capping_size)
             break;
     }
     return m_count = (size-1);
@@ -239,6 +239,11 @@
     m_count = UINT32_MAX;
     Error err;
     ValueObjectSP backend_addr(m_backend.AddressOf(err));
+    m_list_capping_size = 0;
+    if (m_backend.GetTargetSP())
+        m_list_capping_size = m_backend.GetTargetSP()->GetMaximumNumberOfChildrenToDisplay();
+    if (m_list_capping_size == 0)
+        m_list_capping_size = 255;
     if (err.Fail() || backend_addr.get() == NULL)
         return false;
     m_node_address = backend_addr->GetValueAsUnsigned(0);
@@ -257,7 +262,6 @@
         return false;
     lldb::TemplateArgumentKind kind;
     m_element_type = ClangASTType(m_backend.GetClangAST(), ClangASTContext::GetTemplateArgument(m_backend.GetClangAST(), list_type, 0, kind));
-    m_element_size = m_element_type.GetTypeByteSize();
     m_head = impl_sp->GetChildMemberWithName(ConstString("__next_"), true).get();
     m_tail = impl_sp->GetChildMemberWithName(ConstString("__prev_"), true).get();
     return false;