On second thought, amend the previous patch to pass itself the ValueObject& for the static value instead of just its type

llvm-svn: 248316

2 files changed, 5 insertions, 3 deletions

diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
index 8a42c15735b..a5fa004493a 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@@ -271,8 +271,10 @@ ItaniumABILanguageRuntime::GetDynamicTypeAndAddress (ValueObject &in_value,
 }
 
 TypeAndOrName
-ItaniumABILanguageRuntime::FixUpDynamicType(const TypeAndOrName& type_and_or_name, const CompilerType& static_type)
+ItaniumABILanguageRuntime::FixUpDynamicType(const TypeAndOrName& type_and_or_name,
+                                            ValueObject& static_value)
 {
+    CompilerType static_type(static_value.GetCompilerType());
     Flags static_type_flags(static_type.GetTypeInfo());
     
     TypeAndOrName ret(type_and_or_name);
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
index ee79a6f94d8..02e4a0f8534 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
@@ -42,8 +42,8 @@ namespace lldb_private {
                                   Value::ValueType &value_type);
         
         virtual TypeAndOrName
-        FixUpDynamicType(const TypeAndOrName& type_and_or_name,
-                         const CompilerType& static_type);
+        FixUpDynamicType (const TypeAndOrName& type_and_or_name,
+                          ValueObject& static_value);
         
         virtual bool
         CouldHaveDynamicValue (ValueObject &in_value);