Fixed a bug in the expression code which caused

it to interpret a "this" variable that was merely
a pointer -- that is, not a class pointer -- as
meaning that the current context was inside a C++
method.  This bug would prevent expressions from
evaluating correctly in regular C code if there
was a pointer variable named "this" in scope.

llvm-svn: 124117

1 files changed, 6 insertions, 3 deletions

diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 4142c5c8c0e..73c7441b322 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -89,11 +89,14 @@ ClangUserExpression::ScanContext(ExecutionContext &exe_ctx)
         {
             TypeFromUser target_ast_type(pointer_target_type, this_type->GetClangAST());
             
-            if (target_ast_type.IsDefined())
+            if (target_ast_type.IsDefined() &&
+                ClangASTContext::IsCXXClassType(target_ast_type.GetOpaqueQualType()))
+            {
                 m_cplusplus = true;
             
-            if (target_ast_type.IsConst())
-                m_const_object = true;
+                if (target_ast_type.IsConst())
+                    m_const_object = true;
+            }
         }
     }
     else if (self_var.get())