mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 05:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fortran : ICE in gfc_conv_array_constructor_expr PR93497

Browse Source 
Invalid expressions, such as those involving array constructors,
used for the length of character types will cause an ICE.

2020-05-13  Steven G. Kargl  <kargl@gcc.gnu.org>

gcc/fortran/

	PR fortran/93497
	* decl.c (char_len_param_value): Check whether character
	length expression is of type EXPR_OP and if so simplify it.
	* resolve.c (resolve_charlen): Reject length if it has a
	rank.

2020-05-13  Mark Eggleston  <markeggleston@gcc.gnu.org>

gcc/testsuite/

	PR fortran/93497
	* gfortran.dg/pr88025.f90: Change in wording of error.
	* gfortran.dg/pr93497.f90: New test.
	* gfortran.dg/pr93714_1.f90: Change in wording of errors.
	* gfortran.dg/pr93714_2.f90: Change in wording of errors.
This commit is contained in:
Mark Eggleston 2020-05-07 08:29:14 +01:00
parent 6cc6b087c8
commit f9f98e59a7
8 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/fortran/ChangeLog
View File

@ -1,3 +1,11 @@
2020-05-13 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/93497
* decl.c (char_len_param_value): Check whether character
length expression is of type EXPR_OP and if so simplify it.
* resolve.c (resolve_charlen): Reject length if it has a
rank.
2020-05-13 Tobias Burnus <tobias@codesourcery.com>
PR fortran/94690

5
gcc/fortran/decl.c
View File

@ -1077,6 +1077,11 @@ char_len_param_value (gfc_expr **expr, bool *deferred)
if (!gfc_expr_check_typed (*expr, gfc_current_ns, false))
return MATCH_ERROR;
/* If gfortran gets an EXPR_OP, try to simplifiy it. This catches things
like CHARACTER(([1])). */
if ((*expr)->expr_type == EXPR_OP)
gfc_simplify_expr (*expr, 1);
if ((*expr)->expr_type == EXPR_FUNCTION)
{
if ((*expr)->ts.type == BT_INTEGER

2
gcc/fortran/resolve.c
View File

@ -12358,7 +12358,7 @@ resolve_charlen (gfc_charlen *cl)
}
/* cl->length has been resolved. It should have an integer type. */
if (cl->length->ts.type != BT_INTEGER)
if (cl->length->ts.type != BT_INTEGER || cl->length->rank != 0)
{
gfc_error ("Scalar INTEGER expression expected at %L",
&cl->length->where);

8
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2020-05-13 Mark Eggleston <markeggleston@gcc.gnu.org>
PR fortran/93497
* gfortran.dg/pr88025.f90: Change in wording of error.
* gfortran.dg/pr93497.f90: New test.
* gfortran.dg/pr93714_1.f90: Change in wording of errors.
* gfortran.dg/pr93714_2.f90: Change in wording of errors.
2020-05-13 Patrick Palka <ppalka@redhat.com>
PR c++/70642

2
gcc/testsuite/gfortran.dg/pr88025.f90
View File

@ -2,6 +2,6 @@
! PR fortran/88025
program p
type t
character(('')) :: c = 'c' ! { dg-error "must be of INTEGER type" }
character(('')) :: c = 'c' ! { dg-error "Scalar INTEGER expression expected" }
end type
end

8
gcc/testsuite/gfortran.dg/pr93497.f90 Normal file
View File

@ -0,0 +1,8 @@
! { dg-do compile }
program p
print *, [character(((/1/))) :: 'a','b'] ! { dg-error "Scalar INTEGER expression expected" }
print *, [character(([1])) :: 'a','b'] ! { dg-error "Scalar INTEGER expression expected" }
print *, [character(1+[1]) :: 'a','b'] ! { dg-error "Scalar INTEGER expression expected" }
end

4
gcc/testsuite/gfortran.dg/pr93714_1.f90
View File

@ -7,5 +7,5 @@ program test
character, pointer :: b => a
end program
! { dg-error "must be of INTEGER type" " " { target *-*-* } 6 }
! { dg-error "does not have the TARGET attribute" " " { target *-*-* } 7 }
! { dg-error "Scalar INTEGER expression expected" " " { target *-*-* } 6 }
! { dg-error "Different types in pointer assignment" " " { target *-*-* } 7 }

4
gcc/testsuite/gfortran.dg/pr93714_2.f90
View File

@ -7,5 +7,5 @@ program test
character(:), pointer :: b => a
end program
! { dg-error "must be of INTEGER type" " " { target *-*-* } 6 }
! { dg-error "does not have the TARGET attribute" " " { target *-*-* } 7 }
! { dg-error "Scalar INTEGER expression expected" " " { target *-*-* } 6 }
! { dg-error "Different types in pointer assignment" " " { target *-*-* } 7 }