diff options
8 files changed, 18 insertions, 14 deletions
diff --git a/lldb/include/lldb/Target/LanguageRuntime.h b/lldb/include/lldb/Target/LanguageRuntime.h index 37aa0ceb6ac..37f4f308b76 100644 --- a/lldb/include/lldb/Target/LanguageRuntime.h +++ b/lldb/include/lldb/Target/LanguageRuntime.h @@ -65,8 +65,8 @@ public: // Derived, not Derived*. The job of this API is to correct this misalignment between the // static type and the discovered dynamic type virtual TypeAndOrName - FixUpDynamicType(const TypeAndOrName& type_and_or_name, - const CompilerType& static_type) = 0; + FixUpDynamicType (const TypeAndOrName& type_and_or_name, + ValueObject& static_value) = 0; virtual void SetExceptionBreakpoints () diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp b/lldb/source/Core/ValueObjectDynamicValue.cpp index 99668b76aab..e801bd71434 100644 --- a/lldb/source/Core/ValueObjectDynamicValue.cpp +++ b/lldb/source/Core/ValueObjectDynamicValue.cpp @@ -211,7 +211,7 @@ ValueObjectDynamicValue::UpdateValue () if (class_type_or_name.HasType()) { m_type_impl = TypeImpl(m_parent->GetCompilerType(), - runtime->FixUpDynamicType(class_type_or_name, m_parent->GetCompilerType()).GetCompilerType()); + runtime->FixUpDynamicType(class_type_or_name, *m_parent).GetCompilerType()); } else { @@ -271,7 +271,7 @@ ValueObjectDynamicValue::UpdateValue () } if (runtime) - m_dynamic_type_info = runtime->FixUpDynamicType(m_dynamic_type_info, m_parent->GetCompilerType()); + m_dynamic_type_info = runtime->FixUpDynamicType(m_dynamic_type_info, *m_parent); //m_value.SetContext (Value::eContextTypeClangType, corrected_type); m_value.SetCompilerType (m_dynamic_type_info.GetCompilerType()); 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); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp index 4ff235d1677..b84bae6e491 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp @@ -270,8 +270,10 @@ AppleObjCRuntime::GetDynamicTypeAndAddress (ValueObject &in_value, } TypeAndOrName -AppleObjCRuntime::FixUpDynamicType(const TypeAndOrName& type_and_or_name, const CompilerType& static_type) +AppleObjCRuntime::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/ObjC/AppleObjCRuntime/AppleObjCRuntime.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h index 6f4f40b1de8..397d874e669 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h @@ -50,8 +50,8 @@ public: Value::ValueType &value_type) override; TypeAndOrName - FixUpDynamicType(const TypeAndOrName& type_and_or_name, - const CompilerType& static_type) override; + FixUpDynamicType (const TypeAndOrName& type_and_or_name, + ValueObject& static_value) override; // These are the ObjC specific functions. diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp index ac841c28643..d4d4ac99897 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp @@ -314,8 +314,8 @@ RenderScriptRuntime::GetDynamicTypeAndAddress(ValueObject &in_value, lldb::Dynam } TypeAndOrName -RenderScriptRuntime::FixUpDynamicType(const TypeAndOrName& type_and_or_name, - const CompilerType& static_type) +RenderScriptRuntime::FixUpDynamicType (const TypeAndOrName& type_and_or_name, + ValueObject& static_value) { return type_and_or_name; } diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h index 4e2f693c094..9f91fb955b7 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h @@ -185,8 +185,8 @@ class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime 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); |
