Bugfixes for the new "self" pointer handling.  Specifically,
the code to pass the _cmd pointer has been improved, and _cmd
is now set to the value of _cmd for the current context, as
opposed to being simply NULL.


git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@121739 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index 449db41..b210d49 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -373,7 +373,8 @@
     lldb::addr_t &object_ptr,
     ConstString &object_name,
     ExecutionContext &exe_ctx,
-    Error &err
+    Error &err,
+    bool suppress_type_check
 )
 {
     assert (m_struct_vars.get());
@@ -390,7 +391,9 @@
         return false;
     }
     
-    Variable *object_ptr_var = FindVariableInScope (*exe_ctx.frame, object_name, &m_struct_vars->m_object_pointer_type);
+    Variable *object_ptr_var = FindVariableInScope (*exe_ctx.frame,
+                                                    object_name, 
+                                                    (suppress_type_check ? NULL : &m_struct_vars->m_object_pointer_type));
     
     if (!object_ptr_var)
     {