2002-02-01 Daniel Jacobowitz <drow@mvista.com>

        * gnu-v3-abi.c (gnuv3_virtual_fn_field): Update comments.
        Update ``this'' pointer when calling virtual functions.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 24b8c75172625fc1c8511b2002dcab99ff722789..1c6544c433df20a2b3fa9faba031ec382fe3567f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-01  Daniel Jacobowitz  <drow@mvista.com>
+
+       * gnu-v3-abi.c (gnuv3_virtual_fn_field): Update comments.
+       Update ``this'' pointer when calling virtual functions.
+
 2002-02-01  Michael Snyder  <msnyder@redhat.com>
 
        * breakpoint.c (create_temp_exception_breakpoint): Delete.

diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index a4c79605000cd8bf3a5fd50759ace436af913960..ae2104d59c4720ecfe3ba6a79070e20e7dd65cba 100644 (file)
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -318,7 +318,9 @@ gnuv3_virtual_fn_field (struct value **value_p,
   /* Now value is an object of the appropriate base type.  Fetch its
      virtual table.  */
   /* It might be possible to do this cast at the same time as the above.
-     Does multiple inheritance affect this?  */
+     Does multiple inheritance affect this?
+     Can this even trigger, or is TYPE_VPTR_BASETYPE idempotent?
+  */
   if (TYPE_VPTR_BASETYPE (vfn_base) != vfn_base)
     value = value_cast (TYPE_VPTR_BASETYPE (vfn_base), value);
   vtable_address
@@ -337,6 +339,10 @@ gnuv3_virtual_fn_field (struct value **value_p,
   vfn = value_cast (lookup_pointer_type (TYPE_FN_FIELD_TYPE (f, j)),
                     vfn);
 
+  /* Is (type)value always numerically the same as (vfn_base)value?
+     If so we can spare this cast and use one of the ones above.  */
+  *value_p = value_addr (value_cast (type, *value_p));
+
   return vfn;
 }