1 files changed, 21 insertions, 19 deletions

diff --git a/lldb/source/Expression/ClangExpressionVariable.cpp b/lldb/source/Expression/ClangExpressionVariable.cpp
index 79a7e4f2fb9..bf1a3dad648 100644
--- a/lldb/source/Expression/ClangExpressionVariable.cpp
+++ b/lldb/source/Expression/ClangExpressionVariable.cpp
@@ -28,14 +28,16 @@ using namespace clang;
 ClangExpressionVariable::ClangExpressionVariable(lldb::ByteOrder byte_order, uint32_t addr_byte_size) :
     m_parser_vars(),
     m_jit_vars (),
-    m_valojb_sp (new ValueObjectConstResult(byte_order, addr_byte_size))
+    m_frozen_sp (new ValueObjectConstResult(byte_order, addr_byte_size)),
+    m_flags (EVNone)
 {
 }
 
 ClangExpressionVariable::ClangExpressionVariable (const lldb::ValueObjectSP &valobj_sp) :
     m_parser_vars(),
     m_jit_vars (),
-    m_valojb_sp (valobj_sp)
+    m_frozen_sp (valobj_sp),
+    m_flags (EVNone)
 {
 }
 
@@ -45,76 +47,76 @@ ClangExpressionVariable::ClangExpressionVariable (const lldb::ValueObjectSP &val
 size_t 
 ClangExpressionVariable::GetByteSize ()
 {
-    return m_valojb_sp->GetByteSize();
+    return m_frozen_sp->GetByteSize();
 }    
 
 const ConstString &
 ClangExpressionVariable::GetName ()
 {
-    return m_valojb_sp->GetName();
+    return m_frozen_sp->GetName();
 }    
 
 lldb::ValueObjectSP
 ClangExpressionVariable::GetValueObject()
 {
-    return m_valojb_sp;
+    return m_frozen_sp;
 }
 
 lldb::RegisterInfo *
 ClangExpressionVariable::GetRegisterInfo()
 {
-    return m_valojb_sp->GetValue().GetRegisterInfo();
+    return m_frozen_sp->GetValue().GetRegisterInfo();
 }
 
 void
 ClangExpressionVariable::SetRegisterInfo (const lldb::RegisterInfo *reg_info)
 {
-    return m_valojb_sp->GetValue().SetContext (Value::eContextTypeRegisterInfo, const_cast<lldb::RegisterInfo *>(reg_info));
+    return m_frozen_sp->GetValue().SetContext (Value::eContextTypeRegisterInfo, const_cast<lldb::RegisterInfo *>(reg_info));
 }
 
 lldb::clang_type_t
 ClangExpressionVariable::GetClangType()
 {
-    return m_valojb_sp->GetClangType();
+    return m_frozen_sp->GetClangType();
 }    
 
 void
 ClangExpressionVariable::SetClangType(lldb::clang_type_t clang_type)
 {
-    m_valojb_sp->GetValue().SetContext(Value::eContextTypeClangType, clang_type);
+    m_frozen_sp->GetValue().SetContext(Value::eContextTypeClangType, clang_type);
 }    
 
 clang::ASTContext *
 ClangExpressionVariable::GetClangAST()
 {
-    return m_valojb_sp->GetClangAST();
+    return m_frozen_sp->GetClangAST();
 }    
 
 void
 ClangExpressionVariable::SetClangAST (clang::ASTContext *ast)
 {
-    m_valojb_sp->SetClangAST (ast);
+    m_frozen_sp->SetClangAST (ast);
 }
 
 TypeFromUser
 ClangExpressionVariable::GetTypeFromUser()
 {
-    TypeFromUser tfu (m_valojb_sp->GetClangType(), m_valojb_sp->GetClangAST());
+    TypeFromUser tfu (m_frozen_sp->GetClangType(), m_frozen_sp->GetClangAST());
     return tfu;
 }    
 
 uint8_t *
 ClangExpressionVariable::GetValueBytes()
 {
-    const size_t byte_size = m_valojb_sp->GetByteSize();
+    const size_t byte_size = m_frozen_sp->GetByteSize();
     if (byte_size > 0)
     {
-        if (m_valojb_sp->GetDataExtractor().GetByteSize() < byte_size)
+        if (m_frozen_sp->GetDataExtractor().GetByteSize() < byte_size)
         {
-            m_valojb_sp->GetValue().ResizeData(byte_size);
-            m_valojb_sp->GetValue().GetData (m_valojb_sp->GetDataExtractor());
+            m_frozen_sp->GetValue().ResizeData(byte_size);
+            m_frozen_sp->GetValue().GetData (m_frozen_sp->GetDataExtractor());
         }
-        return const_cast<uint8_t *>(m_valojb_sp->GetDataExtractor().GetDataStart());
+        return const_cast<uint8_t *>(m_frozen_sp->GetDataExtractor().GetDataStart());
     }
     return NULL;
 }
@@ -122,12 +124,12 @@ ClangExpressionVariable::GetValueBytes()
 void
 ClangExpressionVariable::SetName (const ConstString &name)
 {
-    m_valojb_sp->SetName (name);
+    m_frozen_sp->SetName (name);
 }
 
 void
 ClangExpressionVariable::ValueUpdated ()
 {
-    m_valojb_sp->ValueUpdated ();
+    m_frozen_sp->ValueUpdated ();
 }