summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core/ValueObjectVariable.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Core/ValueObjectVariable.cpp')
-rw-r--r--lldb/source/Core/ValueObjectVariable.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp
index 653b3cb58e8..f5c5d0132da 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -180,7 +180,7 @@ ValueObjectVariable::UpdateValue ()
case Value::eValueTypeScalar:
// The variable value is in the Scalar value inside the m_value.
// We can point our m_data right to it.
- m_error = m_value.GetValueAsData (&exe_ctx, GetClangAST(), m_data, 0, GetModule());
+ m_error = m_value.GetValueAsData (&exe_ctx, GetClangAST(), m_data, 0, GetModule().get());
break;
case Value::eValueTypeFileAddress:
@@ -233,7 +233,7 @@ ValueObjectVariable::UpdateValue ()
// so it can extract read its value into m_data appropriately
Value value(m_value);
value.SetContext(Value::eContextTypeVariable, variable);
- m_error = value.GetValueAsData(&exe_ctx, GetClangAST(), m_data, 0, GetModule());
+ m_error = value.GetValueAsData(&exe_ctx, GetClangAST(), m_data, 0, GetModule().get());
}
break;
}
@@ -272,7 +272,7 @@ ValueObjectVariable::IsInScope ()
}
-Module *
+lldb::ModuleSP
ValueObjectVariable::GetModule()
{
if (m_variable_sp)
@@ -280,12 +280,10 @@ ValueObjectVariable::GetModule()
SymbolContextScope *sc_scope = m_variable_sp->GetSymbolContextScope();
if (sc_scope)
{
- SymbolContext sc;
- sc_scope->CalculateSymbolContext (&sc);
- return sc.module_sp.get();
+ return sc_scope->CalculateSymbolContextModule();
}
}
- return NULL;
+ return lldb::ModuleSP();
}
SymbolContextScope *
OpenPOWER on IntegriCloud