simplify.c (gfc_simplify_reshape): Convert assert into returning NULL, which…

simplify.c (gfc_simplify_reshape): Convert assert into returning NULL, which triggers an error condition.

2015-06-02  Steven G. Kargl  <kargl@gcc.gnu.org>

	* simplify.c (gfc_simplify_reshape): Convert assert into returning
	NULL, which triggers an error condition.

2015-06-02  Steven G. Kargl  <kargl@gcc.gnu.org>

	* gfortran.dg/reshape_7.f90: New test.

From-SVN: r224043

gcc/fortran/ChangeLog

+2015-06-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* simplify.c (gfc_simplify_reshape): Convert assert into returning
+	NULL, which triggers an error condition.
+
 2015-05-27  Andre Vehreschild  <vehre@gmx.de>
 
 	PR fortran/65548

gcc/fortran/simplify.c

@@ -5188,8 +5188,11 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
 	e = gfc_constructor_lookup_expr (source->value.constructor, j);
       else
 	{
-	  gcc_assert (npad > 0);
-
+	  if (npad <= 0)
+	    {
+	      mpz_clear (index);
+	      return NULL;
+	    }
 	  j = j - nsource;
 	  j = j % npad;
 	  e = gfc_constructor_lookup_expr (pad->value.constructor, j);

gcc/testsuite/ChangeLog

+2015-06-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* gfortran.dg/reshape_7.f90: New test.
+
 2015-06-02  David Malcolm  <dmalcolm@redhat.com>
 
 	PR c/66220:

gcc/testsuite/gfortran.dg/reshape_7.f90

+! { dg-do compile }
+! PR fortran/66380
+!
+subroutine p0
+   integer, parameter :: sh(2) = [2, 3]
+   integer, parameter :: &
+   & a(2,2) = reshape([1, 2, 3, 4], sh)   ! { dg-error "Different shape" }
+   if (a(1,1) /= 0) call abort
+end subroutine p0
+
+
+subroutine p1
+   integer, parameter :: sh(2) = [2, 1]
+   integer, parameter :: &
+   &  a(2,2) = reshape([1, 2, 3, 4], sh)  ! { dg-error "Different shape" }
+   if (a(1,1) /= 0) call abort
+end subroutine p1