8 files changed, 81 insertions, 30 deletions
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index f6a3d53032b..9fc4167f31b 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -1953,6 +1953,12 @@ ValueObject::GetTypeName()
 }
 
 ConstString
+ValueObject::GetDisplayTypeName()
+{
+    return GetTypeName();
+}
+
+ConstString
 ValueObject::GetQualifiedTypeName()
 {
     return GetClangType().GetConstQualifiedTypeName();
diff --git a/lldb/source/Core/ValueObjectChild.cpp b/lldb/source/Core/ValueObjectChild.cpp
index ccf87cd15b2..33b91f9e30d 100644
--- a/lldb/source/Core/ValueObjectChild.cpp
+++ b/lldb/source/Core/ValueObjectChild.cpp
@@ -66,25 +66,29 @@ ValueObjectChild::CalculateNumChildren()
     return GetClangType().GetNumChildren (true);
 }
 
+static void
+AdjustForBitfieldness(ConstString& name,
+                      uint8_t bitfield_bit_size)
+{
+    if (name && bitfield_bit_size)
+    {
+        const char *clang_type_name = name.AsCString();
+        if (clang_type_name)
+        {
+            std::vector<char> bitfield_type_name (strlen(clang_type_name) + 32, 0);
+            ::snprintf (&bitfield_type_name.front(), bitfield_type_name.size(), "%s:%u", clang_type_name, bitfield_bit_size);
+            name.SetCString(&bitfield_type_name.front());
+        }
+    }
+}
+
 ConstString
 ValueObjectChild::GetTypeName()
 {
     if (m_type_name.IsEmpty())
     {
         m_type_name = GetClangType().GetConstTypeName ();
-        if (m_type_name)
-        {
-            if (m_bitfield_bit_size > 0)
-            {
-                const char *clang_type_name = m_type_name.AsCString();
-                if (clang_type_name)
-                {
-                    std::vector<char> bitfield_type_name (strlen(clang_type_name) + 32, 0);
-                    ::snprintf (&bitfield_type_name.front(), bitfield_type_name.size(), "%s:%u", clang_type_name, m_bitfield_bit_size);
-                    m_type_name.SetCString(&bitfield_type_name.front());
-                }
-            }
-        }
+        AdjustForBitfieldness(m_type_name, m_bitfield_bit_size);
     }
     return m_type_name;
 }
@@ -93,22 +97,18 @@ ConstString
 ValueObjectChild::GetQualifiedTypeName()
 {
     ConstString qualified_name = GetClangType().GetConstTypeName();
-    if (qualified_name)
-    {
-        if (m_bitfield_bit_size > 0)
-        {
-            const char *clang_type_name = qualified_name.AsCString();
-            if (clang_type_name)
-            {
-                std::vector<char> bitfield_type_name (strlen(clang_type_name) + 32, 0);
-                ::snprintf (&bitfield_type_name.front(), bitfield_type_name.size(), "%s:%u", clang_type_name, m_bitfield_bit_size);
-                qualified_name.SetCString(&bitfield_type_name.front());
-            }
-        }
-    }
+    AdjustForBitfieldness(qualified_name, m_bitfield_bit_size);
     return qualified_name;
 }
 
+ConstString
+ValueObjectChild::GetDisplayTypeName()
+{
+    ConstString display_name = GetClangType().GetDisplayTypeName();
+    AdjustForBitfieldness(display_name, m_bitfield_bit_size);
+    return display_name;
+}
+
 bool
 ValueObjectChild::UpdateValue ()
 {
diff --git a/lldb/source/Core/ValueObjectConstResult.cpp b/lldb/source/Core/ValueObjectConstResult.cpp
index d6d86381358..387e171e352 100644
--- a/lldb/source/Core/ValueObjectConstResult.cpp
+++ b/lldb/source/Core/ValueObjectConstResult.cpp
@@ -276,6 +276,12 @@ ValueObjectConstResult::GetTypeName()
     return m_type_name;
 }
 
+ConstString
+ValueObjectConstResult::GetDisplayTypeName()
+{
+    return GetClangType().GetDisplayTypeName();
+}
+
 bool
 ValueObjectConstResult::UpdateValue ()
 {
diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/Core/ValueObjectDynamicValue.cpp
index a9f2606212c..a6fad7a9b1f 100644
--- a/lldb/source/Core/ValueObjectDynamicValue.cpp
+++ b/lldb/source/Core/ValueObjectDynamicValue.cpp
@@ -71,8 +71,6 @@ ValueObjectDynamicValue::GetTypeName()
     {
         if (m_dynamic_type_info.HasName())
             return m_dynamic_type_info.GetName();
-        if (m_dynamic_type_info.HasType())
-            return GetClangType().GetConstTypeName();
     }
     return m_parent->GetTypeName();
 }
@@ -96,10 +94,22 @@ ValueObjectDynamicValue::GetQualifiedTypeName()
     {
         if (m_dynamic_type_info.HasName())
             return m_dynamic_type_info.GetName();
+    }
+    return m_parent->GetQualifiedTypeName();
+}
+
+ConstString
+ValueObjectDynamicValue::GetDisplayTypeName()
+{
+    const bool success = UpdateValueIfNeeded(false);
+    if (success)
+    {
         if (m_dynamic_type_info.HasType())
-            return GetClangType().GetConstQualifiedTypeName ();
+            return GetClangType().GetDisplayTypeName();
+        if (m_dynamic_type_info.HasName())
+            return m_dynamic_type_info.GetName();
     }
-    return m_parent->GetTypeName();
+    return m_parent->GetDisplayTypeName();
 }
 
 size_t
diff --git a/lldb/source/Core/ValueObjectMemory.cpp b/lldb/source/Core/ValueObjectMemory.cpp
index 42fd0e8fffb..d2cbbfdda24 100644
--- a/lldb/source/Core/ValueObjectMemory.cpp
+++ b/lldb/source/Core/ValueObjectMemory.cpp
@@ -147,6 +147,14 @@ ValueObjectMemory::GetTypeName()
     return m_clang_type.GetConstTypeName();
 }
 
+ConstString
+ValueObjectMemory::GetDisplayTypeName()
+{
+    if (m_type_sp)
+        return m_type_sp->GetClangForwardType().GetDisplayTypeName();
+    return m_clang_type.GetDisplayTypeName();
+}
+
 size_t
 ValueObjectMemory::CalculateNumChildren()
 {
diff --git a/lldb/source/Core/ValueObjectRegister.cpp b/lldb/source/Core/ValueObjectRegister.cpp
index 4f21457519e..0db1f0cd45c 100644
--- a/lldb/source/Core/ValueObjectRegister.cpp
+++ b/lldb/source/Core/ValueObjectRegister.cpp
@@ -55,6 +55,12 @@ ValueObjectRegisterContext::GetTypeName()
 }
 
 ConstString
+ValueObjectRegisterContext::GetDisplayTypeName()
+{
+    return ConstString();
+}
+
+ConstString
 ValueObjectRegisterContext::GetQualifiedTypeName()
 {
     return ConstString();
diff --git a/lldb/source/Core/ValueObjectSyntheticFilter.cpp b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
index a65b8f63e31..18d36164989 100644
--- a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
+++ b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
@@ -101,6 +101,12 @@ ValueObjectSynthetic::GetQualifiedTypeName()
     return m_parent->GetQualifiedTypeName();
 }
 
+ConstString
+ValueObjectSynthetic::GetDisplayTypeName()
+{
+    return m_parent->GetDisplayTypeName();
+}
+
 size_t
 ValueObjectSynthetic::CalculateNumChildren()
 {
diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp
index 2e5bb22a890..225dc02c8ad 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -73,6 +73,15 @@ ValueObjectVariable::GetTypeName()
 }
 
 ConstString
+ValueObjectVariable::GetDisplayTypeName()
+{
+    Type * var_type = m_variable_sp->GetType();
+    if (var_type)
+        return var_type->GetClangForwardType().GetDisplayTypeName();
+    return ConstString();
+}
+
+ConstString
 ValueObjectVariable::GetQualifiedTypeName()
 {
     Type * var_type = m_variable_sp->GetType();