Fix https://bugzilla.redhat.com/show_bug.cgi?id=849357

	* cp-valprint.c (cp_print_value_fields): Use get_vptr_fieldno.
gdb/testsuite
	* gdb.cp/derivation.exp: Add regression test.
	* gdb.cp/derivation.cc (class V_base, class V_inter, class
	V_derived): New.
	(vderived): New global.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8faa029878774b7bd690cc9b900830d2ee01d58d..fe69ce6d13425f76a786ab4253cd59f43d3ce33f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-27  Tom Tromey  <tromey@redhat.com>
+
+       Fix https://bugzilla.redhat.com/show_bug.cgi?id=849357
+       * cp-valprint.c (cp_print_value_fields): Use get_vptr_fieldno.
+
 2012-09-27  Joel Brobecker  <brobecker@adacore.com>
 
        * sol-thread.c (sol_thread_fetch_registers)

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index c066aa5e742d7166c01012e0d46d1b885ba30ee4..e6a99ecb873e84175248e440fc7914f3aceaae4c 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -210,7 +210,9 @@ cp_print_value_fields (struct type *type, struct type *real_type,
     {
       int statmem_obstack_initial_size = 0;
       int stat_array_obstack_initial_size = 0;
-      
+      struct type *vptr_basetype = NULL;
+      int vptr_fieldno;
+
       if (dont_print_statmem == 0)
        {
          statmem_obstack_initial_size =
@@ -225,6 +227,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
            }
        }
 
+      vptr_fieldno = get_vptr_fieldno (type, &vptr_basetype);
       for (i = n_baseclasses; i < len; i++)
        {
          /* If requested, skip printing of static fields.  */
@@ -358,7 +361,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                                           v, stream, recurse + 1,
                                           options);
                }
-             else if (i == TYPE_VPTR_FIELDNO (type))
+             else if (i == vptr_fieldno && type == vptr_basetype)
                {
                  int i_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
                  struct type *i_type = TYPE_FIELD_TYPE (type, i);

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6707751d94d71ad535f2b58ba34b645379f448ce..a68f69d2b57c6c8b7ef07318568ee783d68b0cf5 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-27  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.cp/derivation.exp: Add regression test.
+       * gdb.cp/derivation.cc (class V_base, class V_inter, class
+       V_derived): New.
+       (vderived): New global.
+
 2012-09-26  Tom Tromey  <tromey@redhat.com>
 
        * gdb.dwarf2/dw2-common-block.S: New file.

diff --git a/gdb/testsuite/gdb.cp/derivation.cc b/gdb/testsuite/gdb.cp/derivation.cc
index 942fcd26b65206f8e3a364965073e42ea0475168..fcd57ce22ba30549671defc4209f43fccadde32b 100644 (file)
--- a/gdb/testsuite/gdb.cp/derivation.cc
+++ b/gdb/testsuite/gdb.cp/derivation.cc
@@ -118,8 +118,37 @@ public:
     
 };
 
+class V_base
+{
+public:
+  virtual void m();
+  int base;
+};
+
+void
+V_base::m()
+{
+}
+
+class V_inter : public virtual V_base
+{
+public:
+  virtual void f();
+  int inter;
+};
+
+void
+V_inter::f()
+{
+}
 
+class V_derived : public V_inter
+{
+public:
+  double x;
+};
 
+V_derived vderived;
 
 int A::afoo() {
     return 1;

diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp
index b752b526e48fa83cc4cff419cb3a94f93a46c9cc..a4210d9d422b7547e8ffc565998d778d0a5fea6f 100644 (file)
--- a/gdb/testsuite/gdb.cp/derivation.exp
+++ b/gdb/testsuite/gdb.cp/derivation.exp
@@ -176,3 +176,11 @@ gdb_test_multiple "frame" "re-selected 'main' frame after inferior call" {
 
 gdb_test "print g_instance.bfoo()" "\\$\[0-9\]+ = 2" "print value of g_instance.bfoo()"
 gdb_test "print g_instance.cfoo()" "\\$\[0-9\]+ = 3" "print value of g_instance.cfoo()"
+
+# This is a regression test for a bug that caused a crash when trying
+# to print the vtbl pointer.  We don't care about the output so much
+# here (it is tested elsewhere), just that gdb doesn't crash.  We test
+# "ptype" first because, before the gdb fix, that was the only code
+# path calling get_vptr_fieldno.
+gdb_test "ptype vderived" "type = .*"
+gdb_test "print vderived" " = {.* inter = 0.*x = 0}"