From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28817 invoked by alias); 22 Jan 2009 16:25:49 -0000 Received: (qmail 28785 invoked by uid 22791); 22 Jan 2009 16:25:47 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.4) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 22 Jan 2009 16:25:42 +0000 Received: (qmail 28009 invoked from network); 22 Jan 2009 16:25:39 -0000 Received: from unknown (HELO orlando.local) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 22 Jan 2009 16:25:39 -0000 From: Pedro Alves To: gdb-patches@sourceware.org Subject: PATCH: Fix for PR9631 Date: Thu, 22 Jan 2009 16:25:00 -0000 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_+4JeJ1+YCgKH+WZ" Message-Id: <200901221626.38123.pedro@codesourcery.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-01/txt/msg00453.txt.bz2 --Boundary-00=_+4JeJ1+YCgKH+WZ Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 772 PR9631 shows a case where vbasetype can be a TYPE_STUB, and since we were not accounting for it, we crashed in TYPE_FIELD_BITPOS: static int gnuv3_baseclass_offset (struct type *type, int index, const bfd_byte *valaddr, CORE_ADDR address) { ... vbasetype = TYPE_VPTR_BASETYPE (type); vbasetype_vptr_fieldno = get_vptr_fieldno (vbasetype, NULL); if (vbasetype_vptr_fieldno >= 0 && TYPE_FIELD_BITPOS (vbasetype, vbasetype_vptr_fieldno) != 0) <<< here error (_("Illegal vptr offset in class %s"), TYPE_NAME (vbasetype) ? TYPE_NAME (vbasetype) : ""); This patch handles it, and adds new testcase. Does it look like the right thing to do here? get_vptr_fieldno also always goes through check_typedef right at the top. OK? -- Pedro Alves --Boundary-00=_+4JeJ1+YCgKH+WZ Content-Type: text/x-diff; charset="iso 8859-15"; name="pr9631.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pr9631.diff" Content-length: 4206 2009-01-22 Pedro Alves PR c++/9631: * gnu-v3-abi.c (gnuv3_baseclass_offset): Call check_typedef on vbasetype. 2009-01-22 Pedro Alves PR c++/9631: * gdb.cp/pr9631.cc, gdb.cp/pr9631.exp: New. --- gdb/gnu-v3-abi.c | 2 - gdb/testsuite/gdb.cp/pr9631.cc | 42 +++++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.cp/pr9631.exp | 48 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) Index: src/gdb/gnu-v3-abi.c =================================================================== --- src.orig/gdb/gnu-v3-abi.c 2009-01-21 12:51:12.000000000 +0000 +++ src/gdb/gnu-v3-abi.c 2009-01-22 15:21:03.000000000 +0000 @@ -460,7 +460,7 @@ gnuv3_baseclass_offset (struct type *typ 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 Index: src/gdb/testsuite/gdb.cp/pr9631.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.cp/pr9631.cc 2009-01-22 16:12:55.000000000 +0000 @@ -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 . +*/ + +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 */ +} Index: src/gdb/testsuite/gdb.cp/pr9631.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.cp/pr9631.exp 2009-01-22 16:12:09.000000000 +0000 @@ -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 . + +# 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 = { = {_vptr.vbase = $hex}, = {}, }" --Boundary-00=_+4JeJ1+YCgKH+WZ--