Fix PR gdb/778

        * gdbtypes.c (fill_in_vptr_fieldno): Call check_typedef
        before recursing.
        * gnu-v3-abi.c (gnuv3_virtual_fn_field): Check return value
        of fill_in_vptr_fieldno.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 60688791138e3902981909793087fd4830869de3..b2c884f2d53ba5317b00cd24aa91dfdf04bb98cd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-02  Daniel Jacobowitz  <drow@mvista.com>
+
+       Fix PR gdb/778
+       * gdbtypes.c (fill_in_vptr_fieldno): Call check_typedef
+       before recursing.
+       * gnu-v3-abi.c (gnuv3_virtual_fn_field): Check return value
+       of fill_in_vptr_fieldno.
+
 2002-10-02  Elena Zannoni  <ezannoni@redhat.com>
  
        * inferior.h (registers_info, stepi_command, nexti_command,

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 40223943b7c3e52f8c253012021cb1319a352925..3ef1828cd40efda9dfa819ab6124e6d021158ecc 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1276,13 +1276,12 @@ fill_in_vptr_fieldno (struct type *type)
          virtual (and hence we cannot share the table pointer).  */
       for (i = 0; i < TYPE_N_BASECLASSES (type); i++)
        {
-         fill_in_vptr_fieldno (TYPE_BASECLASS (type, i));
-         if (TYPE_VPTR_FIELDNO (TYPE_BASECLASS (type, i)) >= 0)
+         struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
+         fill_in_vptr_fieldno (baseclass);
+         if (TYPE_VPTR_FIELDNO (baseclass) >= 0)
            {
-             TYPE_VPTR_FIELDNO (type)
-               = TYPE_VPTR_FIELDNO (TYPE_BASECLASS (type, i));
-             TYPE_VPTR_BASETYPE (type)
-               = TYPE_VPTR_BASETYPE (TYPE_BASECLASS (type, i));
+             TYPE_VPTR_FIELDNO (type) = TYPE_VPTR_FIELDNO (baseclass);
+             TYPE_VPTR_BASETYPE (type) = TYPE_VPTR_BASETYPE (baseclass);
              break;
            }
        }

diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index fbab8af0a18595a6e2575cd0d8d4956c710eedb5..2b4e01a78a4e21ebfe69cbc8d7d08c802461d259 100644 (file)
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -324,6 +324,9 @@ gnuv3_virtual_fn_field (struct value **value_p,
      type now.  */
   if (TYPE_VPTR_FIELDNO (vfn_base) < 0)
     fill_in_vptr_fieldno (vfn_base);
+  if (TYPE_VPTR_FIELDNO (vfn_base) < 0)
+    error ("Could not find virtual table pointer for class \"%s\".",
+          TYPE_TAG_NAME (vfn_base) ? TYPE_TAG_NAME (vfn_base) : "<unknown>");
 
   /* Now that we know which base class is defining our virtual
      function, cast our value to that baseclass.  This takes care of