From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id NE8cK5JogF+QCQAAWB0awg (envelope-from ) for ; Fri, 09 Oct 2020 09:41:38 -0400 Received: by simark.ca (Postfix, from userid 112) id A2F161EF6F; Fri, 9 Oct 2020 09:41:38 -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 944F01E4B5 for ; Fri, 9 Oct 2020 09:41:37 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D53D5386F038; Fri, 9 Oct 2020 13:41:36 +0000 (GMT) Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 5C2D73857C55 for ; Fri, 9 Oct 2020 13:41:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5C2D73857C55 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 0DCFE56097; Fri, 9 Oct 2020 09:41:34 -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 yVb3EGQm9Oye; Fri, 9 Oct 2020 09:41:34 -0400 (EDT) Received: from murgatroyd.Home (174-16-122-38.hlrn.qwest.net [174.16.122.38]) (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 BF72656096; Fri, 9 Oct 2020 09:41:33 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH] Fix bit offset regression Date: Fri, 9 Oct 2020 07:41:30 -0600 Message-Id: <20201009134130.3785956-1-tromey@adacore.com> X-Mailer: git-send-email 2.26.2 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" The type-safe attribute patch introduced a regression that can occur when the DW_AT_bit_offset value is negative. This can happen with some Ada programs. This patch fixes the problem. It also fixes a minor oddity in the existing scalar storage test -- this test was intended to assign a smaller number of bits to the field. gdb/ChangeLog 2020-10-09 Tom Tromey * dwarf2/read.c (dwarf2_add_field): Handle signed offsets. gdb/testsuite/ChangeLog 2020-10-09 Tom Tromey * gdb.ada/scalar_storage/storage.adb (Another_Range): New type. (Rec): Add field. Fix range. * gdb.ada/scalar_storage.exp: Update. --- gdb/ChangeLog | 4 ++++ gdb/dwarf2/read.c | 10 +++++----- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.ada/scalar_storage.exp | 4 ++-- gdb/testsuite/gdb.ada/scalar_storage/storage.adb | 9 ++++++--- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index eedfea112d9..2ec3789135d 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -15050,7 +15050,7 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die, /* Get bit offset of field. */ handle_data_member_location (die, cu, fp); attr = dwarf2_attr (die, DW_AT_bit_offset, cu); - if (attr != nullptr && attr->form_is_unsigned ()) + if (attr != nullptr && attr->form_is_constant ()) { if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) { @@ -15060,7 +15060,7 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die, have to do anything special since we don't need to know the size of the anonymous object. */ SET_FIELD_BITPOS (*fp, (FIELD_BITPOS (*fp) - + attr->as_unsigned ())); + + attr->constant_value (0))); } else { @@ -15071,15 +15071,15 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die, the field itself. The result is the bit offset of the LSB of the field. */ int anonymous_size; - int bit_offset = attr->as_unsigned (); + int bit_offset = attr->constant_value (0); attr = dwarf2_attr (die, DW_AT_byte_size, cu); - if (attr != nullptr && attr->form_is_unsigned ()) + if (attr != nullptr && attr->form_is_constant ()) { /* The size of the anonymous object containing the bit field is explicit, so use the indicated size (in bytes). */ - anonymous_size = attr->as_unsigned (); + anonymous_size = attr->constant_value (0); } else { diff --git a/gdb/testsuite/gdb.ada/scalar_storage.exp b/gdb/testsuite/gdb.ada/scalar_storage.exp index b5e634c615b..952d7fd136e 100644 --- a/gdb/testsuite/gdb.ada/scalar_storage.exp +++ b/gdb/testsuite/gdb.ada/scalar_storage.exp @@ -34,5 +34,5 @@ if ![runto "storage.adb:$bp_location" ] then { return } -gdb_test "print V_LE" "= \\(value => 126\\)" -gdb_test "print V_BE" "= \\(value => 126\\)" +gdb_test "print V_LE" "= \\(value => 126, another_value => 12\\)" +gdb_test "print V_BE" "= \\(value => 126, another_value => 12\\)" diff --git a/gdb/testsuite/gdb.ada/scalar_storage/storage.adb b/gdb/testsuite/gdb.ada/scalar_storage/storage.adb index 608425d9dd1..741718e4e51 100644 --- a/gdb/testsuite/gdb.ada/scalar_storage/storage.adb +++ b/gdb/testsuite/gdb.ada/scalar_storage/storage.adb @@ -18,13 +18,16 @@ with System.Storage_Elements; use System.Storage_Elements; procedure Storage is subtype Some_Range is Natural range 0..127; + subtype Another_Range is Natural range 0..15; type Rec is record Value : Some_Range; + Another_Value : Another_Range; end record; for Rec use record - Value at 0 range 0..127; + Value at 0 range 0..6; + Another_Value at 0 range 7..10; end record; type Rec_LE is new Rec; @@ -39,8 +42,8 @@ procedure Storage is V_BE : Rec_BE; begin - V_LE.Value := 126; - V_BE.Value := 126; + V_LE := (126, 12); + V_BE := (126, 12); Do_Nothing (V_LE'Address); -- START Do_Nothing (V_BE'Address); -- 2.26.2