From: Mikael Morin <mikael.morin@tele2.fr>
Date: Tue, 9 Dec 2008 19:20:18 +0000 (+0100)
Subject: re PR fortran/37469 (invalid GMP usage on gfortran.dg/parameter_array_init_3.f90)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=138b3340e66b3e030d30bfbbeb30b9a10f4677c0;p=gcc.git

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

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a46e79adeb1..5c71e8f64e5 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -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
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 07dfc7a08a3..4bdee7c6a8c 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -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]);