From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id el7oHXKMaGFvOgAAWB0awg (envelope-from ) for ; Thu, 14 Oct 2021 16:00:50 -0400 Received: by simark.ca (Postfix, from userid 112) id 729B71F0BB; Thu, 14 Oct 2021 16:00:50 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.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 DDE6B1EE14 for ; Thu, 14 Oct 2021 16:00:49 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C35E63857C63 for ; Thu, 14 Oct 2021 19:58:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C35E63857C63 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634241527; bh=efZOWCT7d41EilEeTg44F23W5s3Da8VbI5udwxH4Of0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=FS96zizqeAlMjgPiZayfzTPcWZvTZnnrk4r5XujHC/6qXls6ALRMLqshJgUngQMv/ OSmxDo8GFpevx6PPN/K/fqDl38SrYDbRClrf0+koFJNMWEz4O4QM/X3t5xpL9xFWAZ iRVfRhcGxhbZZEQHQ9w2OX/oi2QGAl6e6HgbuxDo= Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 95A5A3858412 for ; Thu, 14 Oct 2021 19:58:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 95A5A3858412 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C03231FD39; Thu, 14 Oct 2021 19:58:18 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A824E13DB2; Thu, 14 Oct 2021 19:58:18 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id xAzaJ9qLaGEfCQAAMHmgww (envelope-from ); Thu, 14 Oct 2021 19:58:18 +0000 Date: Thu, 14 Oct 2021 21:58:16 +0200 To: gdb-patches@sourceware.org Subject: [PATCH][gdb/symtab] Handle DW_AT_string_length with location list Message-ID: <20211014195815.GA11048@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Cc: Jan Kratochvil Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, Consider a fortran routine where a string variable s is modified: ... subroutine f(s) character*(*) s print *, s s(1:3) = 'oof' print *, s end subroutine f ... When compiling with optimization level -O1 and printing the type of variable s we get: ... $ gdb -q -batch outputs/gdb.opt/fortran-string/fortran-string \ -ex "b f" \ -ex run \ -ex "ptype s" Breakpoint 1 at 0x4006f7: file fortran-string.f90, line 21. Breakpoint 1, f (s=..., _s=_s@entry=3) at fortran-string.f90:21 21 subroutine f(s) type = character*1 ... while with -O0 we have instead: ... type = character (3) ... The problem is that the type of s is: ... <1><2d6>: Abbrev Number: 21 (DW_TAG_string_type) <2d7> DW_AT_string_length: 0xbf (location list) <2db> DW_AT_byte_size : 4 ... where the DW_AT_string_length is a location list, a case that is not handled by attr_to_dynamic_prop. Fix this by handling attr->form_is_section_offset () in attr_to_dynamic_prop. Tested on x86_64-linux. The test-case is based on gdb.opt/fortran-string.exp from https://src.fedoraproject.org/rpms/gdb/raw/f32/f/gdb-archer-vla-tests.patch . I've updated the copyrights to stretch to 2021. [ I've tried to create a dwarf assembly test-case for this, but didn't manage. ] Co-Authored-By: Jan Kratochvil Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=26910 Any comments? Thanks, - Tom [gdb/symtab] Handle DW_AT_string_length with location list --- gdb/dwarf2/read.c | 24 +++++++++++++++---- gdb/testsuite/gdb.opt/fortran-string.exp | 41 ++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.opt/fortran-string.f90 | 32 +++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 4 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index cbd9a3012eb..0477a689d54 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18468,14 +18468,30 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die, } else if (attr->form_is_constant ()) prop->set_const_val (attr->constant_value (0)); - else + else if (attr->form_is_section_offset ()) { - dwarf2_invalid_attrib_class_complaint (dwarf_form_name (attr->form), - dwarf2_name (die, cu)); - return 0; + switch (attr->name) + { + case DW_AT_string_length: + baton = XOBNEW (obstack, struct dwarf2_property_baton); + baton->property_type = default_type; + fill_in_loclist_baton (cu, &baton->loclist, attr); + prop->set_loclist (baton); + gdb_assert (prop->baton () != NULL); + break; + default: + goto invalid; + } } + else + goto invalid; return 1; + + invalid: + dwarf2_invalid_attrib_class_complaint (dwarf_form_name (attr->form), + dwarf2_name (die, cu)); + return 0; } /* See read.h. */ diff --git a/gdb/testsuite/gdb.opt/fortran-string.exp b/gdb/testsuite/gdb.opt/fortran-string.exp new file mode 100644 index 00000000000..62de48cf9d7 --- /dev/null +++ b/gdb/testsuite/gdb.opt/fortran-string.exp @@ -0,0 +1,41 @@ +# Copyright 2009-2021 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 2 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# This file was written by Jan Kratochvil . + +# Test GDB can cope with Fortran strings having their length present in a CPU +# register. With -O0 the string length is passed on the stack. To make this +# test meaningful the follow assertion should pass. It is not being checked +# here as the "_s" symbol is compiler dependent: +# (gdb) info address _s +# Symbol "_s" is a variable in register XX. + +standard_testfile .f90 + +if { [prepare_for_testing "prepare for testing" ${testfile} ${srcfile} \ + {debug f90 additional_flags=-O1}] } { + return -1 +} + +if ![runto f] then { + perror "couldn't run to f" + continue +} + +gdb_test_no_output "set print frame-arguments all" +gdb_test "frame" ".*s='foo'.*" +gdb_test "ptype s" "type = character \\(3\\)" +gdb_test "p s" "\\$\[0-9\]* = 'foo'" diff --git a/gdb/testsuite/gdb.opt/fortran-string.f90 b/gdb/testsuite/gdb.opt/fortran-string.f90 new file mode 100644 index 00000000000..0a316b2dc79 --- /dev/null +++ b/gdb/testsuite/gdb.opt/fortran-string.f90 @@ -0,0 +1,32 @@ +! Copyright 2009-2021 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 2 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, write to the Free Software +! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +! +! Ihis file is the Fortran source file for dynamic.exp. +! Original file written by Jakub Jelinek . +! Modified for the GDB testcase by Jan Kratochvil . + +subroutine f(s) + character*(*) s + print *, s + s(1:3) = 'oof' + print *, s +end subroutine f + +program main + character*3 s; + s = 'foo' + call f (s) +end program main