From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 8E38E3858431 for ; Mon, 20 Sep 2021 09:41:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8E38E3858431 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x42c.google.com with SMTP id u18so26010152wrg.5 for ; Mon, 20 Sep 2021 02:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=oduv0f9/CTS4yVIHS60RYa4ikZBzOjLe0fMbkwLc7a4=; b=UyUv2AUwdZizN4zfB2t3jo+SDRKQEwYjwLRp07Q6Zo/mPYCvpGxd38RVMGEvzqCFNo k8ZwmrkK21E3Q5dXwaYEnuLYuczw1Us8oDKd2XBBZoAVQQlbU5LF52aCkksUrgVVsVKq HPhvtQhzsMi/dYibKKc59yGiO0T8jaU1cNtxysErmEyPaRWKpSWF/sQ2HxK15N5Z3lvh NWgQC92XZUBPRLw5BoHrEyUwuBUPiaeHNZVbgfRP/SDW6cxbasZbhOtf6e3yO7i9Opo2 1CuAcA5xoWdZRhtm0Q1reiqa1cMyYt1LVbyGQ5Um9AXAj2wGXZfwuclIlINXOiBUl/RO m85Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=oduv0f9/CTS4yVIHS60RYa4ikZBzOjLe0fMbkwLc7a4=; b=ErJd8XnN5zM1PzoBy/xncDQjPv5dnR1PHJ06ekgbg5QFY9i7OYuE+Bq8vsVQJnRWjy 1O2ceyvaQMOD/VrIiw78iCH5hIEoGAQxKW6oSEDSJzW6wFSYdZQxncyYQeFpNsi/+Yuh v5oHnTDw+qMmO+etwFKNQaf4eXpcgM1AEqKkBCZvfT+dgDn5RjVMKmUmNtFOJ16uJZqO A8IfnHd7yxymlyinKuk+cFT2AjzzmD7fW8KXrkiADaFSG6GoWvwH/4/jWUISUKL5NT3m gIUKgoFRonbLP0XvivxmhK6RCJMCtggBj2bpo+X/Qle2jocUaPBIMcYk3EiQUfwYm02E gHzg== X-Gm-Message-State: AOAM531jVh80OQOyE7xgIOJkwgEMetuyHjP25rXwLJQSYfmQhkYgAj3p SCxMYILFjJy0X6sY3UAyeu11kw== X-Google-Smtp-Source: ABdhPJxGV6ZEx0eKFCh8xGdla5iFgPBWGT1ItWsOeMYlCbVt3xjc19NAWlV1HmK0KrFR6OUS4h9ZSA== X-Received: by 2002:a05:6000:2cf:: with SMTP id o15mr27326855wry.364.1632130884569; Mon, 20 Sep 2021 02:41:24 -0700 (PDT) Received: from localhost (host86-153-58-62.range86-153.btcentralplus.com. [86.153.58.62]) by smtp.gmail.com with ESMTPSA id t1sm15385537wrz.39.2021.09.20.02.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 02:41:23 -0700 (PDT) Date: Mon, 20 Sep 2021 10:41:22 +0100 From: Andrew Burgess To: "Kumar N, Bhuvanendra" Cc: "gdb-patches@sourceware.org" , "George, Jini Susan" , "Achra, Nitika" , "Sharma, Alok Kumar" , "E, Nagajyothi" Subject: Re: [PATCH] Fix ptype and print commands for namelist variables(a fortran feature) Message-ID: <20210920094122.GB4950@embecosm.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux/5.8.18-100.fc31.x86_64 (x86_64) X-Uptime: 10:32:54 up 1 day, 41 min, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org 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: , X-List-Received-Date: Mon, 20 Sep 2021 09:41:28 -0000 * Kumar N, Bhuvanendra via Gdb-patches [2021-08-24 09:16:19 +0000]: > [AMD Official Use Only] > > Hi all, > > Requesting code review for this GDB patch. Required patch is attached and also inlined below with this email. > > Problem description/summary: > > GCC/gfortran support namelist(a fortran feature), it emits DW_TAG_namelist and DW_TAG_namelist_item dies. But gdb does not process these dies and support namelist variables during print and ptype commands. When tried to print, it bails out with the error message as shown below. > (gdb) print nml > No symbol "nml" in current context. > > Fix details: > > This fix is to make the print and ptype commands work for namelist variables and its items. Sample output of these commands is shared below, with fixed gdb. > > (gdb) ptype nml > type = Type nml > integer(kind=4) :: a > integer(kind=4) :: b > End Type nml > (gdb) print nml > $1 = ( a = 10, b = 20 ) bhuvan, Thanks for working on this. I have some small style issues, but I have a bigger question which you'll find inline. Thanks, Andrew > > gdb/ChangeLog: > > * dwarf2/read.c (process_die): Add new case for namelist. > (dwarf2_add_field): Process DW_TAG_namelist_item die. > (read_structure_type, handle_struct_member_die, new_symbol) > (dwarf2_name): Update. > * f-valprint.c (f_language::value_print_inner): Add support for > printing namelist items. > * include/dwarf2.def: (DW_AT_namelist_items): Renamed to ... > (DW_AT_namelist_item): ... this. As per dwarf standard. > > gdb/testsuite/ChangeLog: > > * gdb.fortran/namelist.exp: New file. > * gdb.fortran/namelist.f90: New file. > > NOTE: Similarly renaming DW_AT_namelist_items to DW_AT_namelist_item as per DWARF standard naming convention in GCC/gfortran repo (https://github.com/gcc-mirror/gcc) will be handled in separate PATCH. I will raise separate patch for this. > > regards, > bhuvan > > Patch inlined: > > From 0775cbf3716bae9480c3f1f1d9d8860ac561929e Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?=E2=80=9Cbhkumarn=E2=80=9D?= Bhuvanendra.KumarN@amd.com > Date: Mon, 24 Aug 2021 11:49:14 +0530 > Subject: [PATCH] Fix ptype and print commands for namelist variables(a fortran > feature). > > GCC/gfortran support namelist(a fortran feature), it emits DW_TAG_namelist > and DW_TAG_namelist_item dies. But gdb does not process these dies and > support namelist variables during print and ptype commands. When tried to > print, it bails out with the error message as shown below. > (gdb) print nml > No symbol "nml" in current context. > This commit is to make the print and ptype commands work for namelist > variables and its items. Sample output of these commands is shared below, > with fixed gdb. > (gdb) ptype nml > type = Type nml > integer(kind=4) :: a > integer(kind=4) :: b > End Type nml > (gdb) print nml > $1 = ( a = 10, b = 20 ) > --- > gdb/ChangeLog | 11 +++++++ > gdb/dwarf2/read.c | 41 +++++++++++++++++++---- > gdb/f-valprint.c | 10 ++++++ > gdb/testsuite/ChangeLog | 5 +++ > gdb/testsuite/gdb.fortran/namelist.exp | 45 ++++++++++++++++++++++++++ > gdb/testsuite/gdb.fortran/namelist.f90 | 27 ++++++++++++++++ > include/dwarf2.def | 2 +- > 7 files changed, 134 insertions(+), 7 deletions(-) > create mode 100644 gdb/testsuite/gdb.fortran/namelist.exp > create mode 100644 gdb/testsuite/gdb.fortran/namelist.f90 > > diff --git a/gdb/ChangeLog b/gdb/ChangeLog > index 36cb4c9e7e9..ec01c2957e9 100644 > --- a/gdb/ChangeLog > +++ b/gdb/ChangeLog > @@ -1,3 +1,14 @@ > +2021-08-23 Bhuvanendra Kumar N Bhuvanendra.KumarN@amd.com > + > + * dwarf2/read.c (process_die): Add new case for namelist. > + (dwarf2_add_field): Process DW_TAG_namelist_item die. > + (read_structure_type, handle_struct_member_die, new_symbol) > + (dwarf2_name): Update. > + * f-valprint.c (f_language::value_print_inner): Add support for > + printing namelist items. > + * include/dwarf2.def: (DW_AT_namelist_items): Renamed to ... > + (DW_AT_namelist_item): ... this. As per dwarf standard. > + > 2021-06-08 Lancelot Six lsix@lancelotsix.com > * python/lib/gdb/FrameDecorator.py (FrameDecorator): Use 'is None' > diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c > index 96009f1418f..54528d67498 100644 > --- a/gdb/dwarf2/read.c > +++ b/gdb/dwarf2/read.c > @@ -9570,6 +9570,7 @@ process_die (struct die_info *die, struct dwarf2_cu *cu) > case DW_TAG_interface_type: > case DW_TAG_structure_type: > case DW_TAG_union_type: > + case DW_TAG_namelist: > process_structure_scope (die, cu); > break; > case DW_TAG_enumeration_type: > @@ -14417,8 +14418,20 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die, > fp = &new_field->field; > - if (die->tag == DW_TAG_member && ! die_is_declaration (die, cu)) > - { > + if ((die->tag == DW_TAG_member || die->tag == DW_TAG_namelist_item) && > + ! die_is_declaration (die, cu)) The '&&' operator should start the line. > + { > + /* For the DW_TAG_namelist_item die, use the referenced die. */ > + if (die->tag == DW_TAG_namelist_item) > + { > + struct attribute *attr1 = dwarf2_attr (die, DW_AT_namelist_item, cu); > + struct die_info *item_die = NULL; Throughout this patch, please use nullptr instead of NULL. > + struct dwarf2_cu *item_cu = cu; > + if (attr1->form_is_ref ()) > + item_die = follow_die_ref (die, attr1, &item_cu); > + if (item_die != NULL) > + die = item_die; > + } > /* Data member other than a C++ static data member. */ > /* Get type of field. */ > @@ -15449,6 +15462,8 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu) > type = alloc_type (objfile); > INIT_CPLUS_SPECIFIC (type); > + if (die->tag == DW_TAG_namelist) > + INIT_NONE_SPECIFIC (type); I think you should use if/then/else and place INIT_CPLUS_SPECIFIC in the else block. > name = dwarf2_name (die, cu); > if (name != NULL) > @@ -15684,7 +15699,8 @@ handle_struct_member_die (struct die_info *child_die, struct type *type, > struct dwarf2_cu *cu) > { > if (child_die->tag == DW_TAG_member > - || child_die->tag == DW_TAG_variable) > + || child_die->tag == DW_TAG_variable > + || child_die->tag == DW_TAG_namelist_item) > { > /* NOTE: carlton/2002-11-05: A C++ static data member > should be a DW_TAG_member that is a declaration, but > @@ -15728,7 +15744,9 @@ handle_struct_member_die (struct die_info *child_die, struct type *type, > } > /* Finish creating a structure or union type, including filling in > - its members and creating a symbol for it. */ > + its members and creating a symbol for it. This function also > + handles Fortran namelist variable, its items or members and > + creating a symbol for it. */ > static void > process_structure_scope (struct die_info *die, struct dwarf2_cu *cu) > @@ -21807,8 +21825,17 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, > case DW_TAG_union_type: > case DW_TAG_set_type: > case DW_TAG_enumeration_type: > - SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF; > - SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN; > + case DW_TAG_namelist: > + if (die->tag == DW_TAG_namelist) > + { > + SYMBOL_ACLASS_INDEX (sym) = LOC_STATIC; > + SYMBOL_DOMAIN (sym) = VAR_DOMAIN; > + } > + else > + { > + SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF; > + SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN; > + } > { > /* NOTE: carlton/2003-11-10: C++ class symbols shouldn't > @@ -22744,6 +22771,7 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu) > && die->tag != DW_TAG_class_type > && die->tag != DW_TAG_interface_type > && die->tag != DW_TAG_structure_type > + && die->tag != DW_TAG_namelist > && die->tag != DW_TAG_union_type) > return NULL; > @@ -22768,6 +22796,7 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu) > case DW_TAG_interface_type: > case DW_TAG_structure_type: > case DW_TAG_union_type: > + case DW_TAG_namelist: > /* Some GCC versions emit spurious DW_AT_name attributes for unnamed > structures or unions. These were of the form "._%d" in GCC 4.1, > or simply "" or "" in GCC 4.3 > diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c > index 240daaf34f9..8ed35e2fb1f 100644 > --- a/gdb/f-valprint.c > +++ b/gdb/f-valprint.c > @@ -320,6 +320,16 @@ f_language::value_print_inner (struct value *val, struct ui_file *stream, > fputs_filtered (" = ", stream); > } > + /* While printing namelist items, fetch the appropriate value > + field before printing its value. */ > + if (TYPE_SPECIFIC_FIELD (type) == TYPE_SPECIFIC_NONE) I'm a little uncomfortable with this if condition. This feels like a bit of a hack. Is there precedent anywhere else in GDB for using the type specific field like this? Wouldn't adding a TYPE_CODE_NAMELIST be more in keeping with how GDB currently does things, though I understand this is likely to make the patch slightly bigger. Did you consider this approach? > + { > + struct block_symbol symni = lookup_symbol(field_name, > + get_selected_block (0), VAR_DOMAIN, nullptr); There's a missing space before '(' here, and two lines below. > + if (symni.symbol != NULL) > + field = value_of_variable(symni.symbol, symni.block); > + } > + > common_val_print (field, stream, recurse + 1, > options, current_language); > diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog > index 87cf3e2a061..33f60c29b3c 100644 > --- a/gdb/testsuite/ChangeLog > +++ b/gdb/testsuite/ChangeLog > @@ -1,3 +1,8 @@ > +2021-07-26 Bhuvanendra Kumar N Bhuvanendra.KumarN@amd.com > + > + * gdb.fortran/namelist.exp: New file. > + * gdb.fortran/namelist.f90: New file. > + > 2021-06-10 Bhuvanendra Kumar N Bhuvanendra.KumarN@amd.com > * gdb.fortran/ptype-on-functions.exp: Add type info of formal > diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.fortran/namelist.exp > new file mode 100644 > index 00000000000..e4df8c7debb > --- /dev/null > +++ b/gdb/testsuite/gdb.fortran/namelist.exp > @@ -0,0 +1,45 @@ > +# Copyright 2020-2021 Free Software Foundation, Inc. The '2020' date is only needed if the patch was original posted in 2020, or if this file is copied/based on some other in-tree file that is copyright 2020+. > + > +# 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 http://www.gnu.org/licenses/. > + > +# This file is part of the gdb testsuite. It contains tests for fortran > +# namelist. > + > +if { [skip_fortran_tests] } { return -1 } > + > +standard_testfile .f90 > +load_lib "fortran.exp" > + > +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { > + return -1 > +} > + > +if ![fortran_runto_main] then { > + perror "couldn't run to main" > + continue > +} > + > +# Depending on the compiler being used, the type names can be printed differently. > +set int [fortran_int4] > + > +gdb_breakpoint [gdb_get_line_number "Display namelist"] > +gdb_continue_to_breakpoint "Display namelist" > + > +if {[test_compiler_info {gcc-*}]} { > + gdb_test "ptype nml" "type = Type nml\r\n *$int :: a\r\n *$int :: b\r\n *End Type nml" > + gdb_test "print nml" \\$\[0-9\]+ = \\( a = 10, b = 20 \\) The pattern should be wrapped onto the newline. Thanks, Andrew > +} else { > + gdb_test "ptype nml" "No symbol \"nml\" in current context\\." > + gdb_test "print nml" "No symbol \"nml\" in current context\\." > +} > diff --git a/gdb/testsuite/gdb.fortran/namelist.f90 b/gdb/testsuite/gdb.fortran/namelist.f90 > new file mode 100644 > index 00000000000..00704eddf27 > --- /dev/null > +++ b/gdb/testsuite/gdb.fortran/namelist.f90 > @@ -0,0 +1,27 @@ > +! Copyright 2020-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 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 http://www.gnu.org/licenses/. > +! > +! This file is the Fortran source file for namelist.exp. > + > +program main > + > + integer :: a, b > + namelist /nml/ a, b > + > + a = 10 > + b = 20 > + Write(*,nml) ! Display namelist > + > +end program main > diff --git a/include/dwarf2.def b/include/dwarf2.def > index 1ae6e1df298..6b8be1f6a16 100644 > --- a/include/dwarf2.def > +++ b/include/dwarf2.def > @@ -289,7 +289,7 @@ DW_AT (DW_AT_frame_base, 0x40) > DW_AT (DW_AT_friend, 0x41) > DW_AT (DW_AT_identifier_case, 0x42) > DW_AT (DW_AT_macro_info, 0x43) > -DW_AT (DW_AT_namelist_items, 0x44) > +DW_AT (DW_AT_namelist_item, 0x44) > DW_AT (DW_AT_priority, 0x45) > DW_AT (DW_AT_segment, 0x46) > DW_AT (DW_AT_specification, 0x47) > -- > 2.17.1 > > >