Remove dwarf2_per_cu_data::dwarf2_per_objfile reference in cutu_reader::keep

[deliverable/binutils-gdb.git] / gdb / eval.c

diff --git a/gdb/eval.c b/gdb/eval.c
index 8104c956b4234fca33d2fb3a5f5b4812db79215d..20533abf93d0f72aa5100e711d06e1b5f8fedf6b 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -296,8 +296,7 @@ evaluate_struct_tuple (struct value *struct_val,
       fieldno++;
       /* Skip static fields.  */
       while (fieldno < struct_type->num_fields ()
-            && field_is_static (&TYPE_FIELD (struct_type,
-                                             fieldno)))
+            && field_is_static (&struct_type->field (fieldno)))
        fieldno++;
       if (fieldno >= struct_type->num_fields ())
        error (_("too many initializers"));
@@ -683,8 +682,8 @@ fake_method::fake_method (type_instance_flags flags,
      allocate memory for auxiliary fields, and free the memory ourselves
      when we are done with it.  */
   type->set_num_fields (num_types);
-  TYPE_FIELDS (type) = (struct field *)
-    xzalloc (sizeof (struct field) * num_types);
+  type->set_fields
+    ((struct field *) xzalloc (sizeof (struct field) * num_types));
 
   while (num_types-- > 0)
     TYPE_FIELD_TYPE (type, num_types) = param_types[num_types];
@@ -692,7 +691,7 @@ fake_method::fake_method (type_instance_flags flags,
 
 fake_method::~fake_method ()
 {
-  xfree (TYPE_FIELDS (&m_type));
+  xfree (m_type.fields ());
 }
 
 /* Helper for evaluating an OP_VAR_VALUE.  */