Cleanup before making the objective C ivar changes.

llvm-svn: 121158

2 files changed, 28 insertions, 47 deletions

diff --git a/lldb/include/lldb/Core/ValueObjectChild.h b/lldb/include/lldb/Core/ValueObjectChild.h
index 2e046cd54d3..011680d4293 100644
--- a/lldb/include/lldb/Core/ValueObjectChild.h
+++ b/lldb/include/lldb/Core/ValueObjectChild.h
@@ -38,22 +38,40 @@ public:
     virtual ~ValueObjectChild();
 
     virtual size_t
-    GetByteSize();
+    GetByteSize()
+    {
+        return m_byte_size;
+    }
 
     virtual off_t
-    GetByteOffset();
+    GetByteOffset()
+    {
+        return m_byte_offset;
+    }
 
     virtual uint32_t
-    GetBitfieldBitSize();
+    GetBitfieldBitSize()
+    {
+        return m_bitfield_bit_size;
+    }
 
     virtual uint32_t
-    GetBitfieldBitOffset();
+    GetBitfieldBitOffset()
+    {
+        return m_bitfield_bit_offset;
+    }
 
     virtual clang::ASTContext *
-    GetClangAST ();
+    GetClangAST ()
+    {
+        return m_clang_ast;
+    }
 
     virtual void *
-    GetClangType ();
+    GetClangType ()
+    {
+        return m_clang_type;
+    }
 
     virtual lldb::ValueType
     GetValueType() const;
@@ -82,12 +100,10 @@ protected:
     ConstString m_type_name;
     uint32_t m_byte_size;
     int32_t m_byte_offset;
-    uint32_t m_bitfield_bit_size;
-    uint32_t m_bitfield_bit_offset;
+    uint8_t m_bitfield_bit_size;
+    uint8_t m_bitfield_bit_offset;
     bool m_is_base_class;
 
-    uint32_t
-    GetByteOffset() const;
 //
 //  void
 //  ReadValueFromMemory (ValueObject* parent, lldb::addr_t address);
diff --git a/lldb/source/Core/ValueObjectChild.cpp b/lldb/source/Core/ValueObjectChild.cpp
index 2e1937228af..b8966da73ba 100644
--- a/lldb/source/Core/ValueObjectChild.cpp
+++ b/lldb/source/Core/ValueObjectChild.cpp
@@ -45,8 +45,9 @@ ValueObjectChild::ValueObjectChild
     m_bitfield_bit_offset (bitfield_bit_offset),
     m_is_base_class (is_base_class)
 {
+    assert (bitfield_bit_size   < (sizeof(m_bitfield_bit_size  ) * CHAR_BIT));
+    assert (bitfield_bit_offset < (sizeof(m_bitfield_bit_offset) * CHAR_BIT));
     assert(byte_size != 0 && "TEMPORARY DEBUGGING ASSERT");
-    
     m_name = name;
 }
 
@@ -54,12 +55,6 @@ ValueObjectChild::~ValueObjectChild()
 {
 }
 
-void *
-ValueObjectChild::GetClangType()
-{
-    return m_clang_type;
-}
-
 lldb::ValueType
 ValueObjectChild::GetValueType() const
 {
@@ -72,36 +67,6 @@ ValueObjectChild::CalculateNumChildren()
     return ClangASTContext::GetNumChildren (m_clang_type, true);
 }
 
-clang::ASTContext *
-ValueObjectChild::GetClangAST ()
-{
-    return m_clang_ast;
-}
-
-size_t
-ValueObjectChild::GetByteSize()
-{
-    return m_byte_size;
-}
-
-off_t
-ValueObjectChild::GetByteOffset()
-{
-    return m_byte_offset;
-}
-
-uint32_t
-ValueObjectChild::GetBitfieldBitSize()
-{
-    return m_bitfield_bit_size;
-}
-
-uint32_t
-ValueObjectChild::GetBitfieldBitOffset()
-{
-    return m_bitfield_bit_offset;
-}
-
 ConstString
 ValueObjectChild::GetTypeName()
 {