From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 1B91C3858C2A; Fri, 8 Dec 2023 15:16:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B91C3858C2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1702048561; bh=xZYiVJgedjrpc6c9RSaG76cLI0CFuXfQq2NJizJrFzs=; h=From:To:Subject:Date:From; b=RG1dGX13jxtXiof0lWwIX617NtuEMkH1gITY9kSXfia46AJxJhbc+qHRVFbr2Xb6W aF+75/hZtBkhsqOcj+QKQ9E3kQJ8xkY3lv1o/rix+9g+6XnHOc79pUDG4BXEINvBe8 x/04QkRm1uuqqQ+yI//hAt39uHoD3fDs1mrtf7WA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix dynamic type resolution for LOC_CONST and LOC_CONST_BYTES symbols X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: aaba0d3a1aae0fcf779a7f727064365612ad5837 X-Git-Newrev: 703adbb1f97db52ed63b2a6a074195b1cee0f132 Message-Id: <20231208151601.1B91C3858C2A@sourceware.org> Date: Fri, 8 Dec 2023 15:16:01 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D703adbb1f97d= b52ed63b2a6a074195b1cee0f132 commit 703adbb1f97db52ed63b2a6a074195b1cee0f132 Author: Tom Tromey Date: Mon Nov 27 16:44:22 2023 -0700 Fix dynamic type resolution for LOC_CONST and LOC_CONST_BYTES symbols =20 PR rust/31005 points out that dynamic type resolution of a LOC_CONST or LOC_CONST_BYTES symbol will fail, leading to output like: =20 from_index=3D =20 This patch fixes the problem by using the constant value or bytes when performing type resolution. =20 Thanks to tpzker@thepuzzlemaker.info for a first version of this patch. =20 I also tested this on a big-endian PPC system (cfarm203). =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D31005 Diff: --- gdb/findvar.c | 19 ++++-- gdb/testsuite/gdb.dwarf2/rust-enum.exp | 120 +++++++++++++++++++++++++++++= ++++ 2 files changed, 135 insertions(+), 4 deletions(-) diff --git a/gdb/findvar.c b/gdb/findvar.c index 952ec20c0b7..02b4a12970b 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -534,8 +534,16 @@ language_defn::read_var_value (struct symbol *var, case LOC_CONST: if (is_dynamic_type (type)) { - /* Value is a constant byte-sequence and needs no memory access. */ - type =3D resolve_dynamic_type (type, {}, /* Unused address. */ 0); + gdb_byte bytes[sizeof (LONGEST)]; + + size_t len =3D std::min (sizeof (LONGEST), (size_t) type->length ()); + store_unsigned_integer (bytes, len, + type_byte_order (type), + var->value_longest ()); + gdb::array_view view (bytes, len); + + /* Value is a constant byte-sequence. */ + type =3D resolve_dynamic_type (type, view, /* Unused address. */ 0); } /* Put the constant back in target format. */ v =3D value::allocate (type); @@ -575,8 +583,11 @@ language_defn::read_var_value (struct symbol *var, case LOC_CONST_BYTES: if (is_dynamic_type (type)) { - /* Value is a constant byte-sequence and needs no memory access. */ - type =3D resolve_dynamic_type (type, {}, /* Unused address. */ 0); + gdb::array_view view (var->value_bytes (), + type->length ()); + + /* Value is a constant byte-sequence. */ + type =3D resolve_dynamic_type (type, view, /* Unused address. */ 0); } v =3D value::allocate (type); memcpy (v->contents_raw ().data (), var->value_bytes (), diff --git a/gdb/testsuite/gdb.dwarf2/rust-enum.exp b/gdb/testsuite/gdb.dwa= rf2/rust-enum.exp new file mode 100644 index 00000000000..a052c11fe46 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/rust-enum.exp @@ -0,0 +1,120 @@ +# Copyright 2023 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 . + +load_lib dwarf.exp + +# This test can only be run on targets which support DWARF-2 and use gas. +require dwarf2_support + +standard_testfile main.c -dw.S + +# Make some DWARF for the test. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + upvar cu_lang cu_lang + + declare_labels uinteger_label discr_1_label + declare_labels one_label two_label simple_label + + cu { addr_size 4 } { + compile_unit { + {name file1.txt} + {language @DW_LANG_Rust} + } { + uinteger_label: DW_TAG_base_type { + {DW_AT_byte_size 1 DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_unsigned} + {DW_AT_name {unsigned integer}} + } + + one_label: structure_type { + {name One} + {byte_size 1 DW_FORM_sdata} + } { + member { + {name __0} + {type :$uinteger_label} + {data_member_location 0 data1} + } + } + + two_label: structure_type { + {name Two} + {byte_size 1 DW_FORM_sdata} + } { + member { + {name __0} + {type :$uinteger_label} + {data_member_location 0 data1} + } + } + + simple_label: structure_type { + {name Simple} + {byte_size 2 DW_FORM_sdata} + } { + variant_part { + {discr :$discr_1_label DW_FORM_ref4} + } { + discr_1_label: member { + {type :$uinteger_label} + {data_member_location 0 data1} + {artificial 1 DW_FORM_flag_present} + } + + variant { + {discr_value 65 udata} + } { + member { + {type :$one_label} + {data_member_location 1 data1} + } + } + + variant { + } { + member { + {type :$two_label} + {data_member_location 1 data1} + } + } + } + } + + # In PR rust/31005, a constant Rust enum value could not + # be correctly resolved. + DW_TAG_variable { + {name constant_variable} + {const_value 0x4141 udata} + {type :$simple_label} + } + DW_TAG_variable { + {name constant_variable2} + {const_value "AA" DW_FORM_block1} + {type :$simple_label} + } + } + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 +} + +gdb_test_no_output "set language rust" + +gdb_test "print constant_variable" [string_to_regexp "One(65)"] +gdb_test "print constant_variable2" [string_to_regexp "One(65)"]