3 files changed, 27 insertions, 2 deletions
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 60eaa3afbd1..8767b82c87d 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -1551,6 +1551,13 @@ ValueObject::SetValueFromCString (const char *value_str)
     return true;
 }
 
+bool
+ValueObject::GetDeclaration (Declaration &decl)
+{
+    decl.Clear();
+    return false;
+}
+
 LanguageType
 ValueObject::GetObjectRuntimeLanguage ()
 {
@@ -3432,8 +3439,7 @@ ValueObject::AddressOf (Error &error)
 ValueObjectSP
 ValueObject::Cast (const ClangASTType &clang_ast_type)
 {
-    ValueObjectSP valobj_sp(new ValueObjectCast (*this, GetName(), clang_ast_type));
-    return valobj_sp;    
+    return ValueObjectCast::Create (*this, GetName(), clang_ast_type);
 }
 
 ValueObjectSP
diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/Core/ValueObjectDynamicValue.cpp
index b55d927b760..5ea7993411b 100644
--- a/lldb/source/Core/ValueObjectDynamicValue.cpp
+++ b/lldb/source/Core/ValueObjectDynamicValue.cpp
@@ -34,6 +34,14 @@
 
 using namespace lldb_private;
 
+lldb::ValueObjectSP
+ValueObjectCast::Create (ValueObject &parent, 
+                         const ConstString &name, 
+                         const ClangASTType &cast_type)
+{
+    ValueObjectCast *cast_valobj_ptr = new ValueObjectCast (parent, name, cast_type);
+    return cast_valobj_ptr->GetSP();
+}
 
 ValueObjectCast::ValueObjectCast
 (
diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp
index 1a4a89ce382..181324db251 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -276,3 +276,14 @@ ValueObjectVariable::GetSymbolContextScope()
         return m_variable_sp->GetSymbolContextScope();
     return NULL;
 }
+
+bool
+ValueObjectVariable::GetDeclaration (Declaration &decl)
+{
+    if (m_variable_sp)
+    {
+        decl = m_variable_sp->GetDeclaration();
+        return true;
+    }
+    return false;
+}