* gdbtypes.c (fill_in_vptr_fieldno): Call check_stub_type.

	* gdbtypes.{c,h}: Improve comments on vptr_fieldno.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 73cafffa336a50459028e06a7cc580749cfd62c5..bf86119d3970711ebc8366e18434117cf5f7b627 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug  2 12:06:00 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * gdbtypes.c (fill_in_vptr_fieldno): Call check_stub_type.
+       * gdbtypes.{c,h}: Improve comments on vptr_fieldno.
+
 Mon Aug  2 11:58:52 1993  Fred Fish  (fnf@deneb.cygnus.com)
 
        * README:  Elaborate on gdb C++ support and cfront support.

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 3710f39fd42e62a4d1768df1283bcc21ba34bf8d..bc7e2576ac5317dc75904ca116e7a7e90c51b929 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -749,13 +749,19 @@ lookup_struct_elt_type (type, name, noerr)
   return (struct type *)-1;    /* For lint */
 }
 
-/* This function is really horrible, but to avoid it, there would need
-   to be more filling in of forward references.  */
+/* If possible, make the vptr_fieldno and vptr_basetype fields of TYPE
+   valid.  Callers should be aware that in some cases (for example,
+   the type or one of its baseclasses is a stub type and we are
+   debugging a .o file), this function will not be able to find the virtual
+   function table pointer, and vptr_fieldno will remain -1 and vptr_basetype
+   will remain NULL.  */
 
 void
 fill_in_vptr_fieldno (type)
      struct type *type;
 {
+  check_stub_type (type);
+
   if (TYPE_VPTR_FIELDNO (type) < 0)
     {
       int i;

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 679d569698397536d05266ad3a2c51b034f0d652..8ccf37af99d1146791ff15e9f4ac9f01e54049b6 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -255,8 +255,7 @@ struct type
     } *fields;
 
   /* For types with virtual functions, VPTR_BASETYPE is the base class which
-     defined the virtual function table pointer.  VPTR_FIELDNO is
-     the field number of that pointer in the structure.
+     defined the virtual function table pointer.  
 
      For types that are pointer to member types, VPTR_BASETYPE
      is the type that this pointer is a member of.
@@ -265,6 +264,13 @@ struct type
 
   struct type *vptr_basetype;
 
+  /* Field number of the virtual function table pointer in
+     VPTR_BASETYPE.  If -1, we were unable to find the virtual
+     function table pointer in initial symbol reading, and
+     fill_in_vptr_fieldno should be called to find it if possible.
+
+     Unused if this type does not have virtual functions.  */
+
   int vptr_fieldno;
 
   /* Slot to point to additional language-specific fields of this type.  */