From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 39940 invoked by alias); 16 Nov 2018 13:11:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 39927 invoked by uid 89); 16 Nov 2018 13:11:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,SPF_FAIL,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=MAIN, one-time, onetime, abcdef X-HELO: mga12.intel.com Received: from mga12.intel.com (HELO mga12.intel.com) (192.55.52.136) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 Nov 2018 13:11:16 +0000 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Nov 2018 05:11:14 -0800 Received: from kraken.imu.intel.com ([10.217.246.153]) by fmsmga007.fm.intel.com with ESMTP; 16 Nov 2018 05:11:11 -0800 From: Pawel Wodkowski To: gdb-patches@sourceware.org, murbanski@pl.sii.eu, sbasierski@pl.sii.eu Cc: tim.wiederhake@intel.com, dragos.carciumaru@intel.com, Bernhard Heckel Subject: [PATCH 1/7] DWARF: Don't add nameless modules to partial symbol table. Date: Fri, 16 Nov 2018 13:11:00 -0000 Message-Id: <1542373804-76019-1-git-send-email-pwodkowski@pl.sii.eu> X-SW-Source: 2018-11/txt/msg00243.txt.bz2 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. 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. --- gdb/dwarf2read.c | 13 ++++--- gdb/testsuite/gdb.fortran/block-data.exp | 51 ++++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/block-data.f | 58 ++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 5 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 d2a8cd44f9a5..89fd4ae15e80 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -8995,11 +8995,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, - &objfile->global_psymbols, - 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 != nullptr, + MODULE_DOMAIN, LOC_TYPEDEF, -1, + &objfile->global_psymbols, + 0, cu->language, objfile); break; case DW_TAG_class_type: case DW_TAG_interface_type: diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.fortran/block-data.exp new file mode 100644 index 000000000000..2af250ad3886 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/block-data.exp @@ -0,0 +1,51 @@ +# Copyright 2018 Free Software Foundation, Inc. +# +# Contributed by Intel Corp. +# +# 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 000000000000..a28e687ec885 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/block-data.f @@ -0,0 +1,58 @@ +! Copyright 2018 Free Software Foundation, Inc. +! +! Contributed by Intel Corp. +! +! 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 -- 2.7.4