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.
This commit is contained in:
Mark Eggleston 2020-03-25 08:33:03 +00:00
parent 5f18995e23
commit c38daa7976
5 changed files with 30 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2020-03-25 Steven G. Kargl <kargl@gcc.gnu.org>
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.
2020-03-23 Mark Eggleston <mark.eggleston@codethink.com>
Steven G. Kargl <kargl@gcc.gnu.org>

View File

@ -2248,9 +2248,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 ();

View File

@ -1,3 +1,9 @@
2020-03-25 Mark Eggleston <mark.eggleston@codethink.com>
PR fortran/93484
* gfortran.dg/pr93484_1.f90: New test.
* gfortran.dg/pr93484_2.f90: New test.
2020-03-25 Jakub Jelinek <jakub@redhat.com>
PR middle-end/94303

View File

@ -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

View File

@ -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