git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fortran - ensure simplification of bounds of array-valued named constants 

gcc/fortran/ChangeLog:

	PR fortran/82314
	* decl.c (add_init_expr_to_sym): For proper initialization of
	array-valued named constants the array bounds need to be
	simplified before adding the initializer.

gcc/testsuite/ChangeLog:

	PR fortran/82314
	* gfortran.dg/pr82314.f90: New test.
This commit is contained in:
Harald Anlauf 2021-09-13 19:28:10 +02:00
parent 8d93ba93d3
commit 104c05c528
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gcc/fortran/decl.c
View File

@ -2169,6 +2169,24 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
sym->as->type = AS_EXPLICIT; sym->as->type = AS_EXPLICIT;
} }
/* Ensure that explicit bounds are simplified. */
if (sym->attr.flavor == FL_PARAMETER && sym->attr.dimension
&& sym->as->type == AS_EXPLICIT)
{
for (int dim = 0; dim < sym->as->rank; ++dim)
{
gfc_expr *e;
e = sym->as->lower[dim];
if (e->expr_type != EXPR_CONSTANT)
gfc_reduce_init_expr (e);
e = sym->as->upper[dim];
if (e->expr_type != EXPR_CONSTANT)
gfc_reduce_init_expr (e);
}
}
/* Need to check if the expression we initialized this /* Need to check if the expression we initialized this
to was one of the iso_c_binding named constants. If so, to was one of the iso_c_binding named constants. If so,
and we're a parameter (constant), let it be iso_c. and we're a parameter (constant), let it be iso_c.

11
gcc/testsuite/gfortran.dg/pr82314.f90 Normal file
View File

@ -0,0 +1,11 @@
! { dg-do run }
! PR fortran/82314 - ICE in gfc_conv_expr_descriptor
program p
implicit none
integer, parameter :: karray(merge(3,7,.true.):merge(3,7,.false.)) = 1
integer, parameter :: i = size (karray)
integer, parameter :: l = lbound (karray,1)
integer, parameter :: u = ubound (karray,1)
if (l /= 3 .or. u /= 7 .or. i /= 5) stop 1
end