Fixed a nasty bug where JIT expressions didn't work
when stopped in a const method. Also updated our
testsuite to ensure that JIT is forced in this case.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@157208 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index 00c5ee9..c827592 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -1221,12 +1221,12 @@
return false;
}
- const bool ignore_const = true;
+ const bool object_pointer = true;
VariableSP object_ptr_var = FindVariableInScope (*frame,
object_name,
(suppress_type_check ? NULL : &m_struct_vars->m_object_pointer_type),
- ignore_const);
+ object_pointer);
if (!object_ptr_var)
{
@@ -2175,7 +2175,7 @@
StackFrame &frame,
const ConstString &name,
TypeFromUser *type,
- bool ignore_const
+ bool object_pointer
)
{
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
@@ -2198,20 +2198,42 @@
if (var_sp && type)
{
- if (type->GetASTContext() == var_sp->GetType()->GetClangAST())
- {
- if (!ClangASTContext::AreTypesSame(type->GetASTContext(),
- type->GetOpaqueQualType(),
- var_sp->GetType()->GetClangFullType(),
- ignore_const))
- return lldb::VariableSP();
- }
- else
+ TypeFromUser candidate_type(var_sp->GetType()->GetClangFullType(),
+ var_sp->GetType()->GetClangAST());
+
+ if (candidate_type.GetASTContext() != type->GetASTContext())
{
if (log)
log->PutCString("Skipping a candidate variable because of different AST contexts");
return lldb::VariableSP();
}
+
+ if (object_pointer)
+ {
+ clang::QualType desired_qual_type = clang::QualType::getFromOpaquePtr(type->GetOpaqueQualType());
+ clang::QualType candidate_qual_type = clang::QualType::getFromOpaquePtr(candidate_type.GetOpaqueQualType());
+
+ const clang::PointerType *desired_ptr_type = desired_qual_type->getAs<clang::PointerType>();
+ const clang::PointerType *candidate_ptr_type = candidate_qual_type->getAs<clang::PointerType>();
+
+ if (!desired_ptr_type || !candidate_ptr_type)
+ return lldb::VariableSP();
+
+ clang::QualType desired_target_type = desired_ptr_type->getPointeeType().getUnqualifiedType();
+ clang::QualType candidate_target_type = candidate_ptr_type->getPointeeType().getUnqualifiedType();
+
+ if (!ClangASTContext::AreTypesSame(type->GetASTContext(),
+ desired_target_type.getAsOpaquePtr(),
+ candidate_target_type.getAsOpaquePtr()))
+ return lldb::VariableSP();
+ }
+ else
+ {
+ if (!ClangASTContext::AreTypesSame(type->GetASTContext(),
+ type->GetOpaqueQualType(),
+ var_sp->GetType()->GetClangFullType()))
+ return lldb::VariableSP();
+ }
}
return var_sp;