From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Mon, 26 Oct 2015 17:39:07 +0000 (+0000)
Subject: re PR fortran/36192 (ICE with wrong index types and bad parens)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15c918bc7645580d6e48fdcab77fc6a2a3347daf;p=gcc.git

re PR fortran/36192 (ICE with wrong index types and bad parens)

2015-10-26  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/36192
	* array.c (gfc_ref_dimen_size): Check for BT_INTEGER before calling
	mpz_set.


2015-10-26  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/36192
	* gfortran.dg/pr36192.f90: New test.

From-SVN: r229387
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f7556305678..181545117f6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-26  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/36192
+	* array.c (gfc_ref_dimen_size): Check for BT_INTEGER before calling
+	mpz_set.
+
 2015-10-26  Andre Vehreschild  <vehre@gcc.gnu.org>
 
 	PR fortran/66927
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 2355a980a61..940eeafd7b6 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -2208,7 +2208,8 @@ gfc_ref_dimen_size (gfc_array_ref *ar, int dimen, mpz_t *result, mpz_t *end)
       if (ar->start[dimen] == NULL)
 	{
 	  if (ar->as->lower[dimen] == NULL
-	      || ar->as->lower[dimen]->expr_type != EXPR_CONSTANT)
+	      || ar->as->lower[dimen]->expr_type != EXPR_CONSTANT
+	      || ar->as->lower[dimen]->ts.type != BT_INTEGER)
 	    goto cleanup;
 	  mpz_set (lower, ar->as->lower[dimen]->value.integer);
 	}
@@ -2222,7 +2223,8 @@ gfc_ref_dimen_size (gfc_array_ref *ar, int dimen, mpz_t *result, mpz_t *end)
       if (ar->end[dimen] == NULL)
 	{
 	  if (ar->as->upper[dimen] == NULL
-	      || ar->as->upper[dimen]->expr_type != EXPR_CONSTANT)
+	      || ar->as->upper[dimen]->expr_type != EXPR_CONSTANT
+	      || ar->as->upper[dimen]->ts.type != BT_INTEGER)
 	    goto cleanup;
 	  mpz_set (upper, ar->as->upper[dimen]->value.integer);
 	}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index db008b260a3..c0f8b0dbf64 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-26  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/36192
+	* gfortran.dg/pr36192.f90: New test.
+
 2015-10-26  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc.dg/atomic-noinline.c: Change test on __atomic_is_lock_free.
diff --git a/gcc/testsuite/gfortran.dg/pr36192.f90 b/gcc/testsuite/gfortran.dg/pr36192.f90
new file mode 100644
index 00000000000..df3bfd75f24
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr36192.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! PR fortran/36192.f90
+!
+program three_body
+  real, parameter :: n = 2, d = 2
+  real, dimension(n,d) :: x      ! { dg-error "of INTEGER type|of INTEGER type" }
+  x(1,:) = (/ 1.0, 0.0 /)
+end program three_body
+! { dg-prune-output "have constant shape" }