FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/37469 (invalid GMP usage on gfortran.dg/parameter_array_init_3.f90)

Browse source 
2008-12-09  Mikael Morin  <mikael.morin@tele2.fr>

	PR fortran/37469
	* expr.c (find_array_element): Simplify array bounds.
	Assert that both bounds are constant expressions.

From-SVN: r142606
This commit is contained in:
Mikael Morin 2008-12-09 20:20:18 +01:00 • committed by Mikael Morin
parent fe7a047c75
commit 138b3340e6
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View file

@ -1,3 +1,9 @@
2008-12-09 Mikael Morin <mikael.morin@tele2.fr>
PR fortran/37469
* expr.c (find_array_element): Simplify array bounds.
Assert that both bounds are constant expressions.
2008-12-09 Mikael Morin <mikael.morin@tele2.fr>
PR fortran/35983

17
gcc/fortran/expr.c
View file

@ -1028,6 +1028,14 @@ find_array_element (gfc_constructor *cons, gfc_array_ref *ar,
mpz_init_set_ui (span, 1);
for (i = 0; i < ar->dimen; i++)
{
if (gfc_reduce_init_expr (ar->as->lower[i]) == FAILURE
|| gfc_reduce_init_expr (ar->as->upper[i]) == FAILURE)
{
t = FAILURE;
cons = NULL;
goto depart;
}
e = gfc_copy_expr (ar->start[i]);
if (e->expr_type != EXPR_CONSTANT)
{
@ -1035,14 +1043,15 @@ find_array_element (gfc_constructor *cons, gfc_array_ref *ar,
goto depart;
}
gcc_assert (ar->as->upper[i]->expr_type == EXPR_CONSTANT
&& ar->as->lower[i]->expr_type == EXPR_CONSTANT);
/* Check the bounds. */
if ((ar->as->upper[i]
&& ar->as->upper[i]->expr_type == EXPR_CONSTANT
&& mpz_cmp (e->value.integer,
ar->as->upper[i]->value.integer) > 0)
|| (ar->as->lower[i]->expr_type == EXPR_CONSTANT
&& mpz_cmp (e->value.integer,
ar->as->lower[i]->value.integer) < 0))
|| (mpz_cmp (e->value.integer,
ar->as->lower[i]->value.integer) < 0))
{
gfc_error ("Index in dimension %d is out of bounds "
"at %L", i + 1, &ar->c_where[i]);