From patchwork Fri Aug 11 11:06:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wiederhake, Tim" X-Patchwork-Id: 22074 Received: (qmail 70610 invoked by alias); 11 Aug 2017 11:07:31 -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 70468 invoked by uid 89); 11 Aug 2017 11:07:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=one-time, onetime X-HELO: mga09.intel.com Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 11 Aug 2017 11:07:25 +0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Aug 2017 04:07:22 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga004.jf.intel.com with ESMTP; 11 Aug 2017 04:07:21 -0700 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id v7BB7Kfa007180; Fri, 11 Aug 2017 12:07:21 +0100 Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id v7BB7E88009124; Fri, 11 Aug 2017 13:07:14 +0200 Received: (from twiederh@localhost) by ulvlx001.iul.intel.com with LOCAL id v7BB7ENL009120; Fri, 11 Aug 2017 13:07:14 +0200 From: Tim Wiederhake To: gdb-patches@sourceware.org Cc: qiyaoltc@gmail.com, Bernhard Heckel Subject: [PATCH v3 1/6] DWARF: Don't add nameless modules to partial symbol table. Date: Fri, 11 Aug 2017 13:06:46 +0200 Message-Id: <1502449611-8865-2-git-send-email-tim.wiederhake@intel.com> In-Reply-To: <1502449611-8865-1-git-send-email-tim.wiederhake@intel.com> References: <1502449611-8865-1-git-send-email-tim.wiederhake@intel.com> X-IsSubscribed: yes 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, e.g. as generated by ifort. BLOCK DATA is used for one-time initialization of non-pointer variables in named common blocks. xxxx-yy-zz Bernhard Heckel gdb/ChangeLog: * dwarf2read.c (add_partial_symbol): Skip nameless modules. gdb/testsuite/ChangeLog: * gdb.fortran/block-data.f: New file. * gdb.fortran/block-data.exp: New file. --- gdb/dwarf2read.c | 14 +++++--- gdb/testsuite/gdb.fortran/block-data.exp | 49 ++++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/block-data.f | 56 ++++++++++++++++++++++++++++++++ 3 files changed, 114 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 4f2fdce..b7df134 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -7245,11 +7245,15 @@ 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, - &objfile->global_psymbols, - 0, cu->language, objfile); + /* In Fortran 77 there might be a "BLOCK DATA" module available without + any name, as generated by iFort. If so, we skip the module as it + doesn't bring any value. */ + if (actual_name != NULL) + add_psymbol_to_list (actual_name, strlen (actual_name), + built_actual_name != NULL, + MODULE_DOMAIN, LOC_TYPEDEF, + &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 0000000..9e1f6bd --- /dev/null +++ b/gdb/testsuite/gdb.fortran/block-data.exp @@ -0,0 +1,49 @@ +# Copyright 2017 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..3bc5eb6 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/block-data.f @@ -0,0 +1,56 @@ +c Copyright 2017 Free Software Foundation, Inc. +c +c This program is free software; you can redistribute it and/or modify +c it under the terms of the GNU General Public License as published by +c the Free Software Foundation; either version 3 of the License, or +c (at your option) any later version. +c +c This program is distributed in the hope that it will be useful, +c but WITHOUT ANY WARRANTY; without even the implied warranty of +c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +c GNU General Public License for more details. +c +c You should have received a copy of the GNU General Public License +c along with this program. If not, see . + +c Test if GDB can handle block data without global name + +c 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 + +c 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 + +c 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