From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9905 invoked by alias); 27 Jun 2010 13:17:59 -0000 Received: (qmail 9897 invoked by uid 22791); 27 Jun 2010 13:17:59 -0000 X-SWARE-Spam-Status: No, hits=-5.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 27 Jun 2010 13:17:53 +0000 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5RDHpRe018378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 27 Jun 2010 09:17:51 -0400 Received: from host0.dyn.jankratochvil.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5RDHm9T015194 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 27 Jun 2010 09:17:50 -0400 Received: from host0.dyn.jankratochvil.net (localhost [127.0.0.1]) by host0.dyn.jankratochvil.net (8.14.4/8.14.4) with ESMTP id o5RDHmAF031426 for ; Sun, 27 Jun 2010 15:17:48 +0200 Received: (from jkratoch@localhost) by host0.dyn.jankratochvil.net (8.14.4/8.14.4/Submit) id o5RDHlf0031425 for gdb-patches@sourceware.org; Sun, 27 Jun 2010 15:17:47 +0200 Date: Sun, 27 Jun 2010 13:17:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch] Fix modification of cplus_struct_default Message-ID: <20100627131747.GA31119@host0.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) 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: 2010-06/txt/msg00615.txt.bz2 Hi, (gdb) set print object on (gdb) print rtti_data $2 = (RTTI_base) {_vptr.RTTI_base = 0x400bd0} -> (gdb) set print object on (gdb) print rtti_data $2 = {base = {_vptr.RTTI_base = 0x400bd0}, data = 1} as rtti_data has no RTTI and it falsely interpreted RTTI from its first data field. gnuv3_dynamic_class has protection against !TYPE_CPLUS_DYNAMIC - but it could not work. No regressions on {x86_64,x86_64-m32,i686}-fedora13-linux-gnu. Thanks, Jan gdb/ 2010-06-27 Jan Kratochvil Fix modification of cplus_struct_default. * dwarf2read.c (dwarf2_add_member_fn) : Call ALLOCATE_CPLUS_STRUCT_TYPE. * gdbtypes.c (cplus_struct_default): New empty initializer, comment it. gdb/testsuite/ 2010-06-27 Jan Kratochvil * gdb.cp/virtbase.cc (class RTTI_base, class RTTI_data) (main) : New. * gdb.cp/virtbase.exp (print rtti_data): New. --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -4954,6 +4954,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die, complaint (&symfile_complaints, _("Member function \"%s\" (offset %d) is virtual but the vtable offset is not specified"), fieldname, die->offset); + ALLOCATE_CPLUS_STRUCT_TYPE (type); TYPE_CPLUS_DYNAMIC (type) = 1; } } --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1733,7 +1733,8 @@ check_stub_method_group (struct type *type, int method_id) } } -const struct cplus_struct_type cplus_struct_default; +/* Ensure it is in .rodata (if available) by workarounding GCC PR 44690. */ +const struct cplus_struct_type cplus_struct_default = { }; void allocate_cplus_struct_type (struct type *type) --- a/gdb/testsuite/gdb.cp/virtbase.cc +++ b/gdb/testsuite/gdb.cp/virtbase.cc @@ -74,8 +74,19 @@ public: virtual void b() {} }; +class RTTI_base +{ +public: + virtual ~RTTI_base() {} +}; - +class RTTI_data +{ +public: + RTTI_base base; + int data; + RTTI_data() : data(1) {} +}; int main() { ph::Derived tst; @@ -84,6 +95,7 @@ int main() { E *e = new E; RHB *b = new RHC(); + RTTI_data rtti_data; return 0; // breakpoint 3 } --- a/gdb/testsuite/gdb.cp/virtbase.exp +++ b/gdb/testsuite/gdb.cp/virtbase.exp @@ -60,3 +60,8 @@ gdb_test "print *(D *) e" " = { = {v = 11}, _vptr.D = $hex}" # https://bugzilla.redhat.com/show_bug.cgi?id=560741 gdb_test_no_output "set print object on" gdb_test "print/x b->mA" " = 0xaaaaaaaa" + +# A regression test reported to Red Hat bugzilla, see: +# https://bugzilla.redhat.com/show_bug.cgi?id=606660 +# `set print object on' is expected. +gdb_test "print rtti_data" " = .*, data = 1\}"