From patchwork Wed Feb 27 14:21:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Kulasek X-Patchwork-Id: 31623 Received: (qmail 29894 invoked by alias); 27 Feb 2019 14:18:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 29875 invoked by uid 89); 27 Feb 2019 14:18:21 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=PROGRAM, STOP, complaint, mistakes X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 27 Feb 2019 14:18:18 +0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Feb 2019 06:18:17 -0800 Received: from qa511.imu.intel.com ([10.217.246.160]) by orsmga004.jf.intel.com with ESMTP; 27 Feb 2019 06:18:15 -0800 From: Tomasz Kulasek To: gdb-patches@sourceware.org Cc: Bernhard Heckel Subject: [PATCH v4] Dwarf: Don't add nameless modules to partial symbol table. Date: Wed, 27 Feb 2019 15:21:12 +0100 Message-Id: <1551277272-79935-1-git-send-email-tkulasek@sii.pl> In-Reply-To: <1546688626-18391-1-git-send-email-pwodkowski@pl.sii.eu> References: <1546688626-18391-1-git-send-email-pwodkowski@pl.sii.eu> From: Bernhard Heckel A name for BLOCK DATA in Fortran is optional. If no name has been assigned, GDB will crash during read-in of DWARF when BLOCK DATA is represented via DW_TAG_module. BLOCK DATA is used for one-time initialization of non-pointer variables in named common blocks. As of now there is no issue when gfortran is used as DW_TAG_module is not emited. For Intel ifort the nameless DW_TAG_module is present and have following form: ... <1>
: Abbrev Number: 7 (DW_TAG_module) DW_AT_decl_line : 46 DW_AT_decl_file : 1 DW_AT_description : (indirect string, offset: 0x110): block data DW_AT_high_pc : 0x402bb7 DW_AT_low_pc : 0x402bb7 ... Missing name lead to crash in add_partial_symbol function during length calculation. 2016-06-15 Bernhard Heckel gdb/Changelog: * dwarf2read.c (add_partial_symbol): Skip nameless modules. gdb/testsuite/Changelog: * gdb.fortran/block-data.f: New. * gdb.fortran/block-data.exp: New. Changes from V1 to V2: * No changes - just sent with other patches in series. Changes from V2 to V3: * Decouple from patch series. * Provide example DW_TAG_module in commit message. * Fix mistakes in comments. Changes from V3 to V4: * Dont complain if module have no name in read_module_type. * Fix period excapeing in block-data.exp. --- gdb/dwarf2read.c | 16 ++++----- gdb/testsuite/gdb.fortran/block-data.exp | 49 ++++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/block-data.f | 56 ++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 gdb/testsuite/gdb.fortran/block-data.exp create mode 100644 gdb/testsuite/gdb.fortran/block-data.f diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 98f46e0..3b0274d 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -9018,11 +9018,14 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu) 0, cu->language, objfile); break; case DW_TAG_module: - add_psymbol_to_list (actual_name, strlen (actual_name), - built_actual_name != NULL, - MODULE_DOMAIN, LOC_TYPEDEF, -1, - psymbol_placement::GLOBAL, - 0, cu->language, objfile); + /* In Fortran 77 there might be a "BLOCK DATA" module available wihout + any name. If so, we skip the module as it doesn't bring any value. */ + if (actual_name != nullptr) + add_psymbol_to_list (actual_name, strlen (actual_name), + built_actual_name != NULL, + MODULE_DOMAIN, LOC_TYPEDEF, -1, + psymbol_placement::GLOBAL, + 0, cu->language, objfile); break; case DW_TAG_class_type: case DW_TAG_interface_type: @@ -16929,9 +16932,6 @@ read_module_type (struct die_info *die, struct dwarf2_cu *cu) struct type *type; module_name = dwarf2_name (die, cu); - if (!module_name) - complaint (_("DW_TAG_module has no name, offset %s"), - sect_offset_str (die->sect_off)); type = init_type (objfile, TYPE_CODE_MODULE, 0, module_name); return set_die_type (die, type, cu); diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.fortran/block-data.exp new file mode 100644 index 0000000..389ae15 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/block-data.exp @@ -0,0 +1,49 @@ +# Copyright 2019 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 . + +# This test is supposed to test anonymous block-data statement. + +if { [skip_fortran_tests] } { return -1 } + +standard_testfile .f +load_lib "fortran.exp" + +if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} { + return -1 +} + +if ![runto MAIN__] then { + untested "couldn't run to breakpoint MAIN__" + return -1 +} + +gdb_test "print doub1" "= 1\.11\\d+" "print doub1, default values" +gdb_test "print doub2" "= 2\.22\\d+" "print doub2, default values" +gdb_test "print char1" "= 'abcdef'" "print char1, default values" +gdb_test "print char2" "= 'ghijkl'" "print char2, default values" + +gdb_breakpoint [gdb_get_line_number "! BP_BEFORE_SUB"] +gdb_continue_to_breakpoint "! BP_BEFORE_SUB" ".*! BP_BEFORE_SUB.*" +gdb_test "print doub1" "= 11\.11\\d+" "print doub1, before sub" +gdb_test "print doub2" "= 22\.22\\d+" "print doub2, before sub" +gdb_test "print char1" "= 'ABCDEF'" "print char1, before sub" +gdb_test "print char2" "= 'GHIJKL'" "print char2, before sub" + +gdb_breakpoint [gdb_get_line_number "! BP_SUB"] +gdb_continue_to_breakpoint "! BP_SUB" ".*! BP_SUB.*" +gdb_test "print doub1" "= 11\.11\\d+" "print char1, in sub" +gdb_test "print doub2" "= 22\.22\\d+" "print doub2, in sub" +gdb_test "print char1" "= 'ABCDEF'" "print char1, in sub" +gdb_test "print char2" "= 'GHIJKL'" "print char2, in sub" diff --git a/gdb/testsuite/gdb.fortran/block-data.f b/gdb/testsuite/gdb.fortran/block-data.f new file mode 100644 index 0000000..5f50e64 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/block-data.f @@ -0,0 +1,56 @@ +! Copyright 2019 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 . +! +! Test if GDB can handle block data without global name +! +! MAIN + PROGRAM bdata + DOUBLE PRECISION doub1, doub2 + CHARACTER*6 char1, char2 + + COMMON /BLK1/ doub1, char1 + COMMON /BLK2/ doub2, char2 + + doub1 = 11.111 + doub2 = 22.222 + char1 = 'ABCDEF' + char2 = 'GHIJKL' + CALL sub_block_data ! BP_BEFORE_SUB + STOP + END + +! BLOCK DATA + BLOCK DATA + + DOUBLE PRECISION doub1, doub2 + CHARACTER*6 char1, char2 + + COMMON /BLK1/ doub1, char1 + COMMON /BLK2/ doub2, char2 + DATA doub1, doub2 /1.111, 2.222/ + DATA char1, char2 /'abcdef', 'ghijkl'/ + END + +! SUBROUTINE + SUBROUTINE sub_block_data + + DOUBLE PRECISION doub1, doub2 + CHARACTER*6 char1, char2 + + COMMON /BLK1/ doub1, char1 + COMMON /BLK2/ doub2, char2 + + char1 = char2; ! BP_SUB + END