[LLDB][ClangExpression] Remove unused StructVars::m_object_pointer_type

[Michael137]

Summary

This member variable was removed a while ago in
443427357f539f5ac97e664a53aa9e50788abce9. It was previously used in
materialization code paths that have since been removed. Nowadays,
m_object_pointer_type gets set but not used anywhere.

This patch simply removes all remaining instances of it and any
supporting code.

Testing

• API tests pass

[Michael137]

One potential functional change here would be the removal of GetFullCompilerType in the $__lldb_objc_class code path. Could probably just put it back since it's not immediately obvious how I'd test it.

[aprantl]

Nice cleanup, thanks!

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h

356

I suppose the : m_result_name() is redundant?

[Michael137]

• Default constructor for StructVars

[Michael137]

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h

356

Yup!

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h

private:
   }
 
   /// Deallocate parser-specific variables
   void DisableParserVars() { m_parser_vars.reset(); }
 
   /// The following values contain layout information for the materialized
   /// struct, but are not specific to a single materialization
   struct StructVars {
-    StructVars() : m_result_name(), m_object_pointer_type(nullptr, nullptr) {}
+    StructVars() = default;
 
     lldb::offset_t m_struct_alignment =
         0;                    ///< The alignment of the struct in bytes.
     size_t m_struct_size = 0; ///< The size of the struct in bytes.
     bool m_struct_laid_out =
         false; ///< True if the struct has been laid out and the
                /// layout is valid (that is, no new fields have been
                /// added since).
     ConstString
         m_result_name; ///< The name of the result variable ($1, for example)
-    TypeFromUser m_object_pointer_type; ///< The type of the "this" variable, if
-                                        ///one exists
   };
 
   std::unique_ptr<StructVars> m_struct_vars;
 
   /// Activate struct variables
   void EnableStructVars() {
     if (!m_struct_vars.get())
       m_struct_vars.reset(new struct StructVars);

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

void ClangExpressionDeclMap::LookUpLldbClass(NameSearchContext &context) {
 
   if (m_ctx_obj) {
     Status status;
     lldb::ValueObjectSP ctx_obj_ptr = m_ctx_obj->AddressOf(status);
     if (!ctx_obj_ptr || status.Fail())
       return;
 
     AddContextClassType(context, TypeFromUser(m_ctx_obj->GetCompilerType()));
-
-    m_struct_vars->m_object_pointer_type =
-        TypeFromUser(ctx_obj_ptr->GetCompilerType());
-
     return;
   }
 
   // Clang is looking for the type of "this"
 
   if (frame == nullptr)
     return;
 
if (method_decl) {
 
     TypeFromUser class_user_type(class_qual_type.getAsOpaquePtr(),
                                  function_decl_ctx.GetTypeSystem());
 
     LLDB_LOG(log, "  CEDM::FEVD Adding type for $__lldb_class: {0}",
              class_qual_type.getAsString());
 
     AddContextClassType(context, class_user_type);
-
-    if (method_decl->isInstance()) {
-      // self is a pointer to the object
-
-      QualType class_pointer_type =
-          method_decl->getASTContext().getPointerType(class_qual_type);
-
-      TypeFromUser self_user_type(class_pointer_type.getAsOpaquePtr(),
-                                  function_decl_ctx.GetTypeSystem());
-
-      m_struct_vars->m_object_pointer_type = self_user_type;
-    }
     return;
   }
 
   // This branch will get hit if we are executing code in the context of
   // a function that claims to have an object pointer (through
   // DW_AT_object_pointer?) but is not formally a method of the class.
   // In that case, just look up the "this" variable in the current scope
   // and use its type.
if (this_var && this_var->IsInScope(frame) &&
 
     TypeFromUser pointee_type =
         this_type->GetForwardCompilerType().GetPointeeType();
 
     LLDB_LOG(log, "  FEVD Adding type for $__lldb_class: {0}",
              ClangUtil::GetQualType(pointee_type).getAsString());
 
     AddContextClassType(context, pointee_type);
-    TypeFromUser this_user_type(this_type->GetFullCompilerType());
-    m_struct_vars->m_object_pointer_type = this_user_type;
   }
 }
 
 void ClangExpressionDeclMap::LookUpLldbObjCClass(NameSearchContext &context) {
   Log *log = GetLog(LLDBLog::Expressions);
 
   StackFrame *frame = m_parser_vars->m_exe_ctx.GetFramePtr();
 
   if (m_ctx_obj) {
     Status status;
     lldb::ValueObjectSP ctx_obj_ptr = m_ctx_obj->AddressOf(status);
     if (!ctx_obj_ptr || status.Fail())
       return;
 
     AddOneType(context, TypeFromUser(m_ctx_obj->GetCompilerType()));
-
-    m_struct_vars->m_object_pointer_type =
-        TypeFromUser(ctx_obj_ptr->GetCompilerType());
-
     return;
   }
 
   // Clang is looking for the type of "*self"
 
   if (!frame)
     return;
 
if (method_decl) {
 
     TypeFromUser class_user_type(QualType(interface_type, 0).getAsOpaquePtr(),
                                  function_decl_ctx.GetTypeSystem());
 
     LLDB_LOG(log, "  FEVD[{0}] Adding type for $__lldb_objc_class: {1}",
              ClangUtil::ToString(interface_type));
 
     AddOneType(context, class_user_type);
-
-    if (method_decl->isInstanceMethod()) {
-      // self is a pointer to the object
-
-      QualType class_pointer_type =
-          method_decl->getASTContext().getObjCObjectPointerType(
-              QualType(interface_type, 0));
-
-      TypeFromUser self_user_type(class_pointer_type.getAsOpaquePtr(),
-                                  function_decl_ctx.GetTypeSystem());
-
-      m_struct_vars->m_object_pointer_type = self_user_type;
-    } else {
-      // self is a Class pointer
-      QualType class_type = method_decl->getASTContext().getObjCClassType();
-
-      TypeFromUser self_user_type(class_type.getAsOpaquePtr(),
-                                  function_decl_ctx.GetTypeSystem());
-
-      m_struct_vars->m_object_pointer_type = self_user_type;
-    }
-
     return;
   }
   // This branch will get hit if we are executing code in the context of
   // a function that claims to have an object pointer (through
   // DW_AT_object_pointer?) but is not formally a method of the class.
   // In that case, just look up the "self" variable in the current scope
   // and use its type.
 
if (!self_clang_type)
     return;
 
   LLDB_LOG(log, "  FEVD[{0}] Adding type for $__lldb_objc_class: {1}",
            ClangUtil::ToString(self_type->GetFullCompilerType()));
 
   TypeFromUser class_user_type(self_clang_type);
 
   AddOneType(context, class_user_type);
-
-  TypeFromUser self_user_type(self_type->GetFullCompilerType());
-
-  m_struct_vars->m_object_pointer_type = self_user_type;
 }
 
 void ClangExpressionDeclMap::LookupLocalVarNamespace(
     SymbolContext &sym_ctx, NameSearchContext &name_context) {
   if (sym_ctx.block == nullptr)
     return;
 
   CompilerDeclContext frame_decl_context = sym_ctx.block->GetDeclContext();