3 files changed, 24 insertions, 4 deletions
diff --git a/lldb/include/lldb/Core/ValueObjectRegister.h b/lldb/include/lldb/Core/ValueObjectRegister.h
index dab37846727..39b1871b687 100644
--- a/lldb/include/lldb/Core/ValueObjectRegister.h
+++ b/lldb/include/lldb/Core/ValueObjectRegister.h
@@ -42,6 +42,9 @@ public:
 
     virtual ConstString
     GetTypeName();
+    
+    virtual ConstString
+    GetQualifiedTypeName();
 
     virtual uint32_t
     CalculateNumChildren();
@@ -89,6 +92,9 @@ public:
 
     virtual ConstString
     GetTypeName();
+    
+    virtual ConstString
+    GetQualifiedTypeName();
 
     virtual uint32_t
     CalculateNumChildren();
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index a13c84b7c38..9e27dc0b164 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -275,7 +275,7 @@ ClangASTType
 ValueObject::MaybeCalculateCompleteType ()
 {
     ClangASTType ret(GetClangASTImpl(), GetClangTypeImpl());
-    
+        
     if (m_did_calculate_complete_objc_class_type)
     {
         if (m_override_type.IsValid())
@@ -349,7 +349,10 @@ ValueObject::MaybeCalculateCompleteType ()
         m_override_type = complete_class;
     }
     
-    return m_override_type;
+    if (m_override_type.IsValid())
+        return m_override_type;
+    else
+        return ret;
 }
 
 clang::ASTContext *
diff --git a/lldb/source/Core/ValueObjectRegister.cpp b/lldb/source/Core/ValueObjectRegister.cpp
index befd610f65f..2df5af6d320 100644
--- a/lldb/source/Core/ValueObjectRegister.cpp
+++ b/lldb/source/Core/ValueObjectRegister.cpp
@@ -51,8 +51,13 @@ ValueObjectRegisterContext::GetClangTypeImpl ()
 ConstString
 ValueObjectRegisterContext::GetTypeName()
 {
-    ConstString empty_type_name;
-    return empty_type_name;
+    return ConstString();
+}
+
+ConstString
+ValueObjectRegisterContext::GetQualifiedTypeName()
+{
+    return ConstString();
 }
 
 uint32_t
@@ -151,6 +156,12 @@ ValueObjectRegisterSet::GetTypeName()
     return ConstString();
 }
 
+ConstString
+ValueObjectRegisterSet::GetQualifiedTypeName()
+{
+    return ConstString();
+}
+
 uint32_t
 ValueObjectRegisterSet::CalculateNumChildren()
 {