From patchwork Wed Jan 14 13:49:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keven Boell X-Patchwork-Id: 4677 Received: (qmail 27570 invoked by alias); 14 Jan 2015 13:50:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 27144 invoked by uid 89); 14 Jan 2015 13:50:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mga14.intel.com Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 14 Jan 2015 13:50:11 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 14 Jan 2015 05:44:34 -0800 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 14 Jan 2015 05:49:48 -0800 Received: from ullecvh004g04.iul.intel.com (ullecvh004g04.iul.intel.com [172.28.50.14]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t0EDnlVp007073; Wed, 14 Jan 2015 13:49:47 GMT Received: from ullecvh004g04.iul.intel.com (ullecvh004g04.iul.intel.com [127.0.0.1]) by ullecvh004g04.iul.intel.com (8.13.8/8.13.8) with ESMTP id t0EDnvnO024107; Wed, 14 Jan 2015 14:49:57 +0100 Received: (from kboell@localhost) by ullecvh004g04.iul.intel.com (8.13.8/8.13.8/Submit) id t0EDnvth024106; Wed, 14 Jan 2015 14:49:57 +0100 From: Keven Boell To: gdb-patches@sourceware.org Cc: Keven Boell Subject: [V4 15/18] vla: get dynamic array corner cases to work Date: Wed, 14 Jan 2015 14:49:47 +0100 Message-Id: <1421243390-24015-16-git-send-email-keven.boell@intel.com> In-Reply-To: <1421243390-24015-1-git-send-email-keven.boell@intel.com> References: <1421243390-24015-1-git-send-email-keven.boell@intel.com> This patch does not overwrite the value type in case it is a dynamic type. For dynamic types GDB resolved its dynamic values in a copy of the type. The call to deprecated_set_value_type overwrites the resolved type with the original type, which breaks e.g. pointer to a Fortran type, which contains a dynamic array. Old: (gdb) print &vla1 (PTR TO -> ( real(kind=4) (23959136:23959184))) 0x7fffffffd490 New: (gdb) print &vla1 (PTR TO -> ( real(kind=4) (5))) 0x7fffffffd490 2014-05-28 Keven Boell Sanimir Agovic * value.c (readjust_indirect_value_type): Add check for dynamic types. testsuite/gdb.fortran: * vla-ptr-info.exp: New file. Signed-off-by: Keven Boell --- gdb/testsuite/gdb.fortran/vla-ptr-info.exp | 32 ++++++++++++++++++++++++++++ gdb/value.c | 3 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.fortran/vla-ptr-info.exp diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp new file mode 100644 index 0000000..b2d8f00 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp @@ -0,0 +1,32 @@ +# Copyright 2015 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 "vla.f90" + +if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ + {debug f90 quiet}] } { + return -1 +} + +if ![runto MAIN__] then { + perror "couldn't run to breakpoint MAIN__" + continue +} + +# Check the status of a pointer to a dynamic array. +gdb_breakpoint [gdb_get_line_number "pvla-associated"] +gdb_continue_to_breakpoint "pvla-associated" +gdb_test "print &pvla" " = \\(PTR TO -> \\( real\\(kind=4\\) \\(10,10,10\\)\\)\\) ${hex}" \ + "print pvla pointer information" diff --git a/gdb/value.c b/gdb/value.c index 1a32347..002705a 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -3655,7 +3655,8 @@ readjust_indirect_value_type (struct value *value, struct type *enc_type, struct value *original_value) { /* Re-adjust type. */ - deprecated_set_value_type (value, TYPE_TARGET_TYPE (original_type)); + if (!is_dynamic_type (TYPE_TARGET_TYPE (original_type))) + deprecated_set_value_type (value, TYPE_TARGET_TYPE (original_type)); /* Add embedding info. */ set_value_enclosing_type (value, enc_type);