Message ID | 802db473-0383-5fe1-2493-4968b133312b@codethink.co.uk |
---|---|
State | New |
Headers | show |
Series | None | expand |
On Tue, Feb 11, 2020 at 02:41:26PM +0000, Mark Eggleston wrote: > Please find attached a patch, it is based on Steve Kargl's patch in PR93580 > adding a check for %len and test case. > Looks like the wrong diff was attached. > gcc/fortran/match.c | 4 ++-- > gcc/testsuite/gfortran.dg/pr93484_1.f90 | 8 ++++++++ > gcc/testsuite/gfortran.dg/pr93484_2.f90 | 8 ++++++++ > 3 files changed, 18 insertions(+), 2 deletions(-) > create mode 100644 gcc/testsuite/gfortran.dg/pr93484_1.f90 > create mode 100644 gcc/testsuite/gfortran.dg/pr93484_2.f90 > > diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c > index a74cb8c5c19..03adfca9bd9 100644 > --- a/gcc/fortran/match.c > +++ b/gcc/fortran/match.c > @@ -2222,9 +2222,9 @@ gfc_match_type_spec (gfc_typespec *ts) > > found: > > - m = gfc_match_init_expr (&e); > + m = gfc_match_expr (&e); > if (m == MATCH_NO || m == MATCH_ERROR) > - return MATCH_NO; > + return m;
So it does, I'll have an other go. On 11/02/2020 15:20, Steve Kargl wrote: > On Tue, Feb 11, 2020 at 02:41:26PM +0000, Mark Eggleston wrote: >> Please find attached a patch, it is based on Steve Kargl's patch in PR93580 >> adding a check for %len and test case. >> > Looks like the wrong diff was attached. > >> gcc/fortran/match.c | 4 ++-- >> gcc/testsuite/gfortran.dg/pr93484_1.f90 | 8 ++++++++ >> gcc/testsuite/gfortran.dg/pr93484_2.f90 | 8 ++++++++ >> 3 files changed, 18 insertions(+), 2 deletions(-) >> create mode 100644 gcc/testsuite/gfortran.dg/pr93484_1.f90 >> create mode 100644 gcc/testsuite/gfortran.dg/pr93484_2.f90 >> >> diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c >> index a74cb8c5c19..03adfca9bd9 100644 >> --- a/gcc/fortran/match.c >> +++ b/gcc/fortran/match.c >> @@ -2222,9 +2222,9 @@ gfc_match_type_spec (gfc_typespec *ts) >> >> found: >> >> - m = gfc_match_init_expr (&e); >> + m = gfc_match_expr (&e); >> if (m == MATCH_NO || m == MATCH_ERROR) >> - return MATCH_NO; >> + return m;
From 4a3db68ce1fc8696b0108b4b0633c1f0959dac80 Mon Sep 17 00:00:00 2001 From: Mark Eggleston <markeggleston@gcc.gnu.org> Date: Tue, 11 Feb 2020 08:35:02 +0000 Subject: [PATCH] fortran: ICE using undeclared symbol in array constructor PR93484 Using undeclared symbol k in an expression in the following array constructor results in an ICE: print *, [real(x(k))] If the call to the intrinsic is not in a constructor a no IMPLICIT type error is reported and the ICE does not occur. Matching on an expression instead of an initialisation express an and not converting a MATCH_ERROR return value into MATCH_NO results in the no IMPLICIT error and no ICE. Note: Steven G. Kargl <kargl@gcc.gnu.org> is the author of the changes except for the test cases. gcc/fortran/ChangeLog: PR fortran/93484 * match.c (gfc_match_type_spec): Replace gfc_match_init_expr with gfc_match_expr. Return m if m is MATCH_NO or MATCH_ERROR. gcc/testsuite PR fortran/93484 * gfortran.dg/pr93484_1.f90: New test. * gfortran.dg/pr93484_2.f90: New test. --- gcc/fortran/match.c | 4 ++-- gcc/testsuite/gfortran.dg/pr93484_1.f90 | 8 ++++++++ gcc/testsuite/gfortran.dg/pr93484_2.f90 | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr93484_1.f90 create mode 100644 gcc/testsuite/gfortran.dg/pr93484_2.f90 diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index a74cb8c5c19..03adfca9bd9 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -2222,9 +2222,9 @@ gfc_match_type_spec (gfc_typespec *ts) found: - m = gfc_match_init_expr (&e); + m = gfc_match_expr (&e); if (m == MATCH_NO || m == MATCH_ERROR) - return MATCH_NO; + return m; /* If a comma appears, it is an intrinsic subprogram. */ gfc_gobble_whitespace (); diff --git a/gcc/testsuite/gfortran.dg/pr93484_1.f90 b/gcc/testsuite/gfortran.dg/pr93484_1.f90 new file mode 100644 index 00000000000..3b6dbc9ad79 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr93484_1.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! +program p + implicit none + integer :: x(4) = [1,2,3,4] + print *, [real(x(k))] ! { dg-error "Symbol 'k' at .1. has no IMPLICIT type" } +end + diff --git a/gcc/testsuite/gfortran.dg/pr93484_2.f90 b/gcc/testsuite/gfortran.dg/pr93484_2.f90 new file mode 100644 index 00000000000..4a7f4330ed9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr93484_2.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! +program p + implicit none + integer, parameter :: x(4) = [1,2,3,4] + print *, [real(x(k))] ! { dg-error "Symbol 'k' at .1. has no IMPLICIT type" } +end + -- 2.11.0