From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16253 invoked by alias); 25 Nov 2014 19:54:53 -0000 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 Received: (qmail 16243 invoked by uid 89); 25 Nov 2014 19:54:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 25 Nov 2014 19:54:51 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAPJsmL7027617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 25 Nov 2014 14:54:49 -0500 Received: from host2.jankratochvil.net (ovpn-116-31.ams2.redhat.com [10.36.116.31]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAPJsjFq004636 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO) for ; Tue, 25 Nov 2014 14:54:47 -0500 Date: Tue, 25 Nov 2014 19:54:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch+7.8] Fix 7.8 regression: resolve_dynamic_struct: Assertion `TYPE_NFIELDS (type) > 0' (PR 17642) Message-ID: <20141125195444.GA3400@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="UugvWAfsgieZRqgk" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes X-SW-Source: 2014-11/txt/msg00629.txt.bz2 --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 1126 Hi, https://sourceware.org/bugzilla/show_bug.cgi?id=17642 ------------------------------------------------------------------------------ cat >2.c <2b.c < 0' failed. A problem internal to GDB has been detected, further debugging may prove unreliable. Regression since: commit 012370f6818657a816df1463ee71ca4e4ee40b33 Author: Tom Tromey Date: Thu May 8 11:26:44 2014 -0600 handle VLA in a struct or union Bugreport: Regression with gdb scripts for Linux kernel https://sourceware.org/ml/gdb/2014-08/msg00127.html It is another missing check_typedef(). ------------------------------------------------------------------------------ No regressions on {x86_64,x86_64-m32,i686}-fedora21pre-linux-gnu. That big change after "else" is just reindentation. Thanks, Jan --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="vlatypes.patch" Content-length: 6222 gdb/ 2014-11-25 Jan Kratochvil Fix internal error on stubs of dynamic types. * gdbtypes.c (resolve_dynamic_type_internal): Apply check_typedef to TYPE if not TYPE_CODE_TYPEDEF. gdb/testsuite/ 2014-11-25 Jan Kratochvil Fix internal error on stubs of dynamic types. * gdb.base/vla-stub-define.c: New file. * gdb.base/vla-stub.c: New file. * gdb.base/vla-stub.exp: New file. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 61d259d..aa76604 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1875,41 +1875,48 @@ resolve_dynamic_type_internal (struct type *type, CORE_ADDR addr, if (!is_dynamic_type_internal (real_type, top_level)) return type; - switch (TYPE_CODE (type)) + if (TYPE_CODE (type) == TYPE_CODE_TYPEDEF) { - case TYPE_CODE_TYPEDEF: resolved_type = copy_type (type); TYPE_TARGET_TYPE (resolved_type) = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), addr, top_level); - break; + } + else + { + /* Typedefs do not need to be preserved here but we need + to resolve any possible stub types. */ + type = real_type; - case TYPE_CODE_REF: - { - CORE_ADDR target_addr = read_memory_typed_address (addr, type); + switch (TYPE_CODE (type)) + { + case TYPE_CODE_REF: + { + CORE_ADDR target_addr = read_memory_typed_address (addr, type); - resolved_type = copy_type (type); - TYPE_TARGET_TYPE (resolved_type) - = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), - target_addr, top_level); - break; - } + resolved_type = copy_type (type); + TYPE_TARGET_TYPE (resolved_type) + = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), + target_addr, top_level); + break; + } - case TYPE_CODE_ARRAY: - resolved_type = resolve_dynamic_array (type, addr); - break; + case TYPE_CODE_ARRAY: + resolved_type = resolve_dynamic_array (type, addr); + break; - case TYPE_CODE_RANGE: - resolved_type = resolve_dynamic_range (type, addr); - break; + case TYPE_CODE_RANGE: + resolved_type = resolve_dynamic_range (type, addr); + break; - case TYPE_CODE_UNION: - resolved_type = resolve_dynamic_union (type, addr); - break; + case TYPE_CODE_UNION: + resolved_type = resolve_dynamic_union (type, addr); + break; - case TYPE_CODE_STRUCT: - resolved_type = resolve_dynamic_struct (type, addr); - break; + case TYPE_CODE_STRUCT: + resolved_type = resolve_dynamic_struct (type, addr); + break; + } } /* Resolve data_location attribute. */ diff --git a/gdb/testsuite/gdb.base/vla-stub-define.c b/gdb/testsuite/gdb.base/vla-stub-define.c new file mode 100644 index 0000000..7445a4f --- /dev/null +++ b/gdb/testsuite/gdb.base/vla-stub-define.c @@ -0,0 +1,21 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2014 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 . */ + +struct dynamic_struct +{ + int dynamic_field[0]; +} use_dynamic_struct; diff --git a/gdb/testsuite/gdb.base/vla-stub.c b/gdb/testsuite/gdb.base/vla-stub.c new file mode 100644 index 0000000..b7ccf041 --- /dev/null +++ b/gdb/testsuite/gdb.base/vla-stub.c @@ -0,0 +1,37 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2014 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 . */ + +struct dynamic_struct; +typedef struct dynamic_struct dynamic_struct_t; + +struct static_struct +{ + int field; +}; +typedef struct static_struct static_struct_t; + +struct local_struct +{ + static_struct_t here; + dynamic_struct_t *ptr; +} local_struct; + +int +main (void) +{ + return 0; +} diff --git a/gdb/testsuite/gdb.base/vla-stub.exp b/gdb/testsuite/gdb.base/vla-stub.exp new file mode 100644 index 0000000..f8c9a91 --- /dev/null +++ b/gdb/testsuite/gdb.base/vla-stub.exp @@ -0,0 +1,25 @@ +# Copyright 2014 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 . + +standard_testfile .c vla-stub-define.c +if { [prepare_for_testing "failed to prepare for vla-stub.exp" \ + ${testfile} [list ${srcfile} ${srcfile2}]] } { + return -1 +} + +gdb_test "p *local_struct.ptr" { = {dynamic_field = 0x0}} + +gdb_test "whatis local_struct.here" "type = static_struct_t" +gdb_test "whatis *local_struct.ptr" "type = dynamic_struct_t" --UugvWAfsgieZRqgk--