Move vptr_{fieldno,basetype} out of main_type, and update everything accordingly.

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

diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 423c44211defcf27c39b29f618442089e151cdf7..2a160c502009a72cae4d72d868cf7b024ddf387d 100644 (file)
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -3267,7 +3267,7 @@ read_tilde_fields (struct field_info *fip, char **pp, struct type *type,
              return 0;
            }
 
-         TYPE_VPTR_BASETYPE (type) = t;
+         set_type_vptr_basetype (type, t);
          if (type == t)        /* Our own class provides vtbl ptr.  */
            {
              for (i = TYPE_NFIELDS (t) - 1;
@@ -3279,7 +3279,7 @@ read_tilde_fields (struct field_info *fip, char **pp, struct type *type,
                  if (!strncmp (name, vptr_name, sizeof (vptr_name) - 2)
                      && is_cplus_marker (name[sizeof (vptr_name) - 2]))
                    {
-                     TYPE_VPTR_FIELDNO (type) = i;
+                     set_type_vptr_fieldno (type, i);
                      goto gotit;
                    }
                }
@@ -3292,7 +3292,7 @@ read_tilde_fields (struct field_info *fip, char **pp, struct type *type,
            }
          else
            {
-             TYPE_VPTR_FIELDNO (type) = TYPE_VPTR_FIELDNO (t);
+             set_type_vptr_fieldno (type, TYPE_VPTR_FIELDNO (t));
            }
 
        gotit: