From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QCjdD27ldF+XdgAAWB0awg (envelope-from ) for ; Wed, 30 Sep 2020 16:07:10 -0400 Received: by simark.ca (Postfix, from userid 112) id 3D6591EF44; Wed, 30 Sep 2020 16:07:10 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 9BB9A1E590 for ; Wed, 30 Sep 2020 16:07:08 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3EAB23972030; Wed, 30 Sep 2020 20:07:08 +0000 (GMT) Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id A4B413971C49 for ; Wed, 30 Sep 2020 20:07:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A4B413971C49 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 5592D1175F3; Wed, 30 Sep 2020 16:06:07 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id ux6DlyKKviug; Wed, 30 Sep 2020 16:06:07 -0400 (EDT) Received: from murgatroyd.Home (97-118-100-18.hlrn.qwest.net [97.118.100.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 1257D1175B8; Wed, 30 Sep 2020 16:06:07 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 7/9] Only use stride for final element type Date: Wed, 30 Sep 2020 14:05:58 -0600 Message-Id: <20200930200600.1207702-8-tromey@adacore.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200930200600.1207702-1-tromey@adacore.com> References: <20200930200600.1207702-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Tromey Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" A DWARF array type may specify a stride. Currently, the DWARF reader applies this stride to every dimension of an array. However, this seems incorrect to me -- only the innermost array ought to use the stride, while outer arrays should compute a stride based on the size of the inner arrays. This patch arranges to apply the stride only to the innermost array type. This fixes a bug noticed when running some Ada tests with -fgnat-encodings=minimal. 2020-09-30 Tom Tromey * dwarf2/read.c (read_array_type): Only apply stride to innermost array. gdb/testsuite/ChangeLog 2020-09-30 Tom Tromey * gdb.ada/enum_idx_packed.exp: Add test. * gdb.ada/enum_idx_packed/foo.adb (Multi_Access): New variable. * gdb.ada/enum_idx_packed/pck.ads (Short) (Multi_Dimension, Multi_Dimension_Access): New types. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2/read.c | 16 ++++++++++++---- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.ada/enum_idx_packed.exp | 3 +++ gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb | 5 +++++ gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads | 5 +++++ 6 files changed, 38 insertions(+), 4 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e3e68fc1f29..9a94c5b349f 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -17089,15 +17089,23 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu) int i = 0; while (i < range_types.size ()) - type = create_array_type_with_stride (NULL, type, range_types[i++], - byte_stride_prop, bit_stride); + { + type = create_array_type_with_stride (NULL, type, range_types[i++], + byte_stride_prop, bit_stride); + bit_stride = 0; + byte_stride_prop = nullptr; + } } else { size_t ndim = range_types.size (); while (ndim-- > 0) - type = create_array_type_with_stride (NULL, type, range_types[ndim], - byte_stride_prop, bit_stride); + { + type = create_array_type_with_stride (NULL, type, range_types[ndim], + byte_stride_prop, bit_stride); + bit_stride = 0; + byte_stride_prop = nullptr; + } } /* Understand Dwarf2 support for vector types (like they occur on diff --git a/gdb/testsuite/gdb.ada/enum_idx_packed.exp b/gdb/testsuite/gdb.ada/enum_idx_packed.exp index 91859689c4a..2e5a85e76b3 100644 --- a/gdb/testsuite/gdb.ada/enum_idx_packed.exp +++ b/gdb/testsuite/gdb.ada/enum_idx_packed.exp @@ -118,4 +118,7 @@ foreach_with_prefix scenario {all minimal} { setup_kfail "minimal encodings" *-*-* } gdb_test "print multi_multi(2)" " = $matrix" + + gdb_test "print multi_access.all" \ + " = \\(\\(8, 13, 21, 34, 55\\), \\(1, 1, 2, 3, 5\\)\\)" } diff --git a/gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb b/gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb index e9f30747167..bc82831bb84 100644 --- a/gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb +++ b/gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb @@ -22,6 +22,10 @@ procedure Foo is Small : Small_Table := New_Small_Table (Low => Red, High => Green); Multi : Multi_Table := New_Multi_Table (Red, Green, Low, Medium); Multi_Multi : Multi_Multi_Table := New_Multi_Multi_Table (1, 2, 1, 7, 1, 10); + Multi_Access : Multi_Dimension_Access + := new Multi_Dimension'(True => (1, 1, 2, 3, 5), + False => (8, 13, 21, 34, 55)); + begin Do_Nothing (Full'Address); -- STOP Do_Nothing (Primary'Address); @@ -29,4 +33,5 @@ begin Do_Nothing (Small'Address); Do_Nothing (Multi'Address); Do_Nothing (Multi_Multi'Address); + Do_Nothing (Multi_Access'Address); end Foo; diff --git a/gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads b/gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads index fdfd8bbc4c6..7fe5a9e01d4 100644 --- a/gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads +++ b/gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads @@ -17,6 +17,7 @@ with System; package Pck is type Color is (Black, Red, Green, Blue, White); type Strength is (None, Low, Medium, High); + type Short is new Natural range 0 .. 2 ** 8 - 1; type Full_Table is array (Color) of Boolean; pragma Pack (Full_Table); @@ -43,5 +44,9 @@ package Pck is function New_Multi_Multi_Table (L1, H1, L2, H2, L3, H3: Positive) return Multi_Multi_Table; + type Multi_Dimension is array (Boolean, Color) of Short; + pragma Pack (Multi_Dimension); + type Multi_Dimension_Access is access all Multi_Dimension; + procedure Do_Nothing (A : System.Address); end Pck; -- 2.26.2