re PR fortran/68486 (187.facerec in SPEC CPU 2000 failed to build)

2015-11-22  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/68486
	* simplify.c (gfc_simplify_cshift):  Add EXPR_OP to mix.

2015-11-22  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/68486
	* gfortran.dg/simplify_cshift_2.f90: New test.

From-SVN: r230726

gcc/fortran/ChangeLog

+2015-11-22  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/68486
+	* simplify.c (gfc_simplify_cshift):  Add EXPR_OP to mix.
+
 2015-11-22  James Norris  <jnorris@codesourcery.com>
 	    Steven G. Kargl  <kargl@gcc.gnu.org>
 

gcc/fortran/simplify.c

@@ -1811,6 +1811,7 @@ gfc_simplify_cshift (gfc_expr *array, gfc_expr *shift, gfc_expr *dim)
     {
       case EXPR_VARIABLE:
       case EXPR_ARRAY:
+      case EXPR_OP:
 	a = gfc_copy_expr (array);
 	gfc_simplify_expr (a, 0);
 	if (!is_constant_array_expr (a))

gcc/testsuite/ChangeLog

+2015-11-22  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/68486
+	* gfortran.dg/simplify_cshift_2.f90: New test.
+
 2015-11-22  James Norris  <jnorris@codesourcery.com>
 	    Cesar Philippidis  <cesar@codesourcery.com>
 

gcc/testsuite/gfortran.dg/simplify_cshift_2.f90

+! { dg-do compile }
+subroutine foo(u, n, fl)
+  implicit none
+  integer n
+  real u(5, n), fl(5,n), wl(5,n)
+  real c
+  c = 1
+  wl = u
+  fl = cshift(c * wl, 1, 2)
+end subroutine foo