2009-01-22 Pedro Alves <pedro@codesourcery.com>

	PR c++/9631:
	* gnu-v3-abi.c (gnuv3_baseclass_offset): Call check_typedef on
	vbasetype.

2009-01-22  Pedro Alves  <pedro@codesourcery.com>

	PR c++/9631:
	* gdb.cp/pr9631.cc, gdb.cp/pr9631.exp: New.

5 files changed, 102 insertions, 1 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4bd6681..0645330 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-22  Pedro Alves  <pedro@codesourcery.com>
+
+	PR c++/9631:
+	* gnu-v3-abi.c (gnuv3_baseclass_offset): Call check_typedef on
+	vbasetype.
+
 2009-01-20  Kazu Hirata  <kazu@codesourcery.com>
 
 	* gdb/procfs.c (info_mappings_callback): Cast map->pr_size to
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index 8f2a53b..ea0a7a4 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -460,7 +460,7 @@ gnuv3_baseclass_offset (struct type *type, int index, const bfd_byte *valaddr,
      start of whichever baseclass it resides in, as a sanity measure - iff
      we have debugging information for that baseclass.  */
 
-  vbasetype = TYPE_VPTR_BASETYPE (type);
+  vbasetype = check_typedef (TYPE_VPTR_BASETYPE (type));
   vbasetype_vptr_fieldno = get_vptr_fieldno (vbasetype, NULL);
 
   if (vbasetype_vptr_fieldno >= 0
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d4b3343..5dc3dff 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-22  Pedro Alves  <pedro@codesourcery.com>
+
+	PR c++/9631:
+	* gdb.cp/pr9631.cc, gdb.cp/pr9631.exp: New.
+
 2009-01-22  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* gdb.server/file-transfer.exp: Use EXEEXT variable for
diff --git a/gdb/testsuite/gdb.cp/pr9631.cc b/gdb/testsuite/gdb.cp/pr9631.cc
new file mode 100644
index 0000000..eb9233e
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/pr9631.cc
@@ -0,0 +1,42 @@
+/* This test script is part of GDB, the GNU debugger.
+
+   Copyright 2009,
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace foo
+{
+  class vbase
+  {
+  public:
+    virtual ~vbase() {}
+  };
+};
+
+class empty_base
+{
+};
+
+class bar : public foo::vbase, public virtual empty_base
+{
+};
+
+int
+main(int argc, char *argv[])
+{
+  bar tender;
+  return 0; /* set breakpoint here */
+}
diff --git a/gdb/testsuite/gdb.cp/pr9631.exp b/gdb/testsuite/gdb.cp/pr9631.exp
new file mode 100644
index 0000000..e53a5e0
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/pr9631.exp
@@ -0,0 +1,48 @@
+# Copyright 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This file is part of the gdb testsuite.
+
+if { [skip_cplus_tests] } { continue }
+
+set testfile "pr9631"
+set srcfile ${testfile}.cc
+set binfile ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
+     untested pr9631.exp
+     return -1
+}
+
+if [get_compiler_info ${binfile} "c++"] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+if ![runto_main] then {
+    perror "couldn't run to breakpoint"
+    continue
+}
+
+gdb_breakpoint [gdb_get_line_number "set breakpoint here"]
+gdb_continue_to_breakpoint "after bar tender is initialized"
+
+gdb_test \
+  "print tender" \
+  "\\\$1 = {<foo::vbase> = {_vptr.vbase = $hex}, <empty_base> = {<No data fields>}, <No data fields>}"