From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1442) id CF19B3858D32; Sat, 21 Jan 2023 23:24:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF19B3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674343453; bh=e9ExyctZXbkWWtb1ceNDlsQMRjl4OVl0Gkapu/eRmjU=; h=From:To:Subject:Date:From; b=nV/LRpX/cZNpoxB0V3NS6D5xM05DMECI6AEMMxMTUXNmMjZGbDJxF2Dzdseqpn/u1 fxiUYexfGzLuBHFX1varrdRvdQwjLc8cpOza+32NfNzMvAq6pzFZSFJ5eeDgC1BhSp NKfEJNQGbRvb7zMDAg4dh7pJ38S97J9EWiuQC3rY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jerry DeLisle To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5276] fortran: [PR102595] X-Act-Checkin: gcc X-Git-Author: Jerry DeLisle X-Git-Refname: refs/heads/master X-Git-Oldrev: 046dc9d0d4683bab99d28983d8841ba3c56ef744 X-Git-Newrev: 48f544ad5c98b668d8d345eaafcf09cc0bd44635 Message-Id: <20230121232413.CF19B3858D32@sourceware.org> Date: Sat, 21 Jan 2023 23:24:13 +0000 (GMT) List-Id: https://gcc.gnu.org/g:48f544ad5c98b668d8d345eaafcf09cc0bd44635 commit r13-5276-g48f544ad5c98b668d8d345eaafcf09cc0bd44635 Author: Jerry DeLisle Date: Sat Jan 21 15:19:57 2023 -0800 fortran: [PR102595] PR fortran/102595 gcc/fortran/ChangeLog: * data.cc (gfc_assign_data_value): Remove check for PARAMETER in DATA. * primary.cc (match_variable): Add check for PARAMETER in DATA. gcc/testsuite/ChangeLog: * gfortran.dg/pr88048.f90: Adjust for changed error message. * gfortran.dg/parameter_data0.f90: New test. Diff: --- gcc/fortran/data.cc | 7 ------- gcc/fortran/primary.cc | 10 ++++++++-- gcc/testsuite/gfortran.dg/parameter_data0.f90 | 6 ++++++ gcc/testsuite/gfortran.dg/pr88048.f90 | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gcc/fortran/data.cc b/gcc/fortran/data.cc index 443d35da9cf..d29eb12c1b1 100644 --- a/gcc/fortran/data.cc +++ b/gcc/fortran/data.cc @@ -244,13 +244,6 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index, "array-element nor a scalar-structure-component"; symbol = lvalue->symtree->n.sym; - if (symbol->attr.flavor == FL_PARAMETER) - { - gfc_error ("PARAMETER %qs shall not appear in a DATA statement at %L", - symbol->name, &lvalue->where); - return false; - } - init = symbol->value; last_ts = &symbol->ts; last_con = NULL; diff --git a/gcc/fortran/primary.cc b/gcc/fortran/primary.cc index 543d9cc0de4..28ce5fea865 100644 --- a/gcc/fortran/primary.cc +++ b/gcc/fortran/primary.cc @@ -4076,8 +4076,14 @@ match_variable (gfc_expr **result, int equiv_flag, int host_flag) gfc_error ("Named constant at %C in an EQUIVALENCE"); return MATCH_ERROR; } - /* Otherwise this is checked for and an error given in the - variable definition context checks. */ + if (gfc_in_match_data()) + { + gfc_error ("PARAMETER %qs shall not appear in a DATA statement at %C", + sym->name); + return MATCH_ERROR; + } + /* Otherwise this is checked for an error given in the + variable definition context checks. */ break; case FL_PROCEDURE: diff --git a/gcc/testsuite/gfortran.dg/parameter_data0.f90 b/gcc/testsuite/gfortran.dg/parameter_data0.f90 new file mode 100644 index 00000000000..4f1da9ea42e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/parameter_data0.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +! PR fortran/102595 Similar to 88048 with a zero sized array +program p + complex, parameter:: x(0) = 2 + data x%im /3.0/ ! { dg-error "shall not appear in a DATA statement" } +end diff --git a/gcc/testsuite/gfortran.dg/pr88048.f90 b/gcc/testsuite/gfortran.dg/pr88048.f90 index 11293934330..ad82d45881c 100644 --- a/gcc/testsuite/gfortran.dg/pr88048.f90 +++ b/gcc/testsuite/gfortran.dg/pr88048.f90 @@ -2,6 +2,6 @@ ! PR fortran/88048 program p integer, parameter :: a(2) = 1 - data a(2) /a(1)/ ! { dg-error "definable entity" } + data a(2) /a(1)/ ! { dg-error "shall not appear in a DATA statement" } print *, a end