From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id D82003858C5F; Thu, 9 Feb 2023 20:13:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D82003858C5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675973594; bh=J0Nni5hM3m4v+zoLz8r12Pktr56mNA4niBHGUx3MQcE=; h=From:To:Subject:Date:From; b=jOP3WnWNjYz7m5r2kauLiwHab9iz0KKOLvNEJfG0Doc8TE7s11c/Xkw/4UrBMuMw/ 30emkUtIS7DpwyIL/TmEWYyZkX7eMy5jfKbd13j835uw9UYj9skq5B31G1JEi1SEAh u2lpo/KmIvk9gI4ttwOsPkB6EiVyeZuHQrcMTOxA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9118] Fortran: error handling of global entity appearing in COMMON block [PR103259] X-Act-Checkin: gcc X-Git-Author: Steve Kargl X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 336162e701a81320ced8336d72bbce562b9be15d X-Git-Newrev: 2b3352b5d65bdb3fd612bbe0abe336226987d602 Message-Id: <20230209201314.D82003858C5F@sourceware.org> Date: Thu, 9 Feb 2023 20:13:14 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2b3352b5d65bdb3fd612bbe0abe336226987d602 commit r12-9118-g2b3352b5d65bdb3fd612bbe0abe336226987d602 Author: Steve Kargl Date: Tue Feb 7 20:18:42 2023 +0100 Fortran: error handling of global entity appearing in COMMON block [PR103259] gcc/fortran/ChangeLog: PR fortran/103259 * resolve.cc (resolve_common_vars): Avoid NULL pointer dereference when a symbol's location is not set. gcc/testsuite/ChangeLog: PR fortran/103259 * gfortran.dg/pr103259.f90: New test. (cherry picked from commit 7e9f20f5517429cfaadec14d6b04705e59078565) Diff: --- gcc/fortran/resolve.cc | 12 +++++++++--- gcc/testsuite/gfortran.dg/pr103259.f90 | 11 +++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index a1a91dc425f..565b212c4c8 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -953,9 +953,15 @@ resolve_common_vars (gfc_common_head *common_block, bool named_common) { gsym = gfc_find_gsymbol (gfc_gsym_root, csym->name); if (gsym && (gsym->type == GSYM_MODULE || gsym->type == GSYM_PROGRAM)) - gfc_error_now ("Global entity %qs at %L cannot appear in a " - "COMMON block at %L", gsym->name, - &gsym->where, &csym->common_block->where); + { + if (csym->common_block) + gfc_error_now ("Global entity %qs at %L cannot appear in a " + "COMMON block at %L", gsym->name, + &gsym->where, &csym->common_block->where); + else + gfc_error_now ("Global entity %qs at %L cannot appear in a " + "COMMON block", gsym->name, &gsym->where); + } /* gfc_add_in_common may have been called before, but the reported errors have been ignored to continue parsing. diff --git a/gcc/testsuite/gfortran.dg/pr103259.f90 b/gcc/testsuite/gfortran.dg/pr103259.f90 new file mode 100644 index 00000000000..f78ff26180e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr103259.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/103259 - ICE in resolve_common_vars +! Contributed by G.Steinmetz + +module m + integer :: p + common /c/ p +end +program p ! { dg-error "cannot appear in a COMMON block" } + use m ! { dg-error "is also the name of the current program unit" } +end