From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Sun, 18 Oct 2015 11:29:37 +0000 (+0000)
Subject: backport: re PR fortran/66385 (ICE: FORALL writing multiple elements of one array)
X-Git-Tag: releases/gcc-4.9.4~552
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=718de9bb4f8fabec5b65234af4cc78a2566d093a;p=thirdparty%2Fgcc.git

backport: re PR fortran/66385 (ICE: FORALL writing multiple elements of one array)

2015-10-18  Thomas Koenig  <tkoenig@gcc.gnu.org>

	Backport from trunk
	PR fortran/66385
	* frontend-passes.c (combine_array_constructor): Return early if
	inside a FORALL loop.

2015-10-18  Thomas Koenig  <tkoenig@gcc.gnu.org>

	Backport from trunk
	PR fortran/66385
	* gfortran.dg/forall_17.f90:  New test.

From-SVN: r228943
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4398d805e590..40b2dc38f8ad 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-18  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	Backport from trunk
+	PR fortran/66385
+	* frontend-passes.c (combine_array_constructor): Return early if
+	inside a FORALL loop.
+
 2015-08-07  Mikael Morin  <mikael@gcc.gnu.org>
 
 	PR fortran/66929
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index 23a8ece17ee8..518a80a5c602 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -1088,6 +1088,10 @@ combine_array_constructor (gfc_expr *e)
   if (in_assoc_list)
     return false;
 
+  /* With FORALL, the BLOCKS created by create_var will cause an ICE.  */
+  if (forall_level > 0)
+    return false;
+
   op1 = e->value.op.op1;
   op2 = e->value.op.op2;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0250c0779946..0849fd4e4cc4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-18  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	Backport from trunk
+	PR fortran/66385
+	* gfortran.dg/forall_17.f90:  New test.
+
 2015-10-01  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.dg/lto/pr55113_0.c: Skip on all x86 targets.
diff --git a/gcc/testsuite/gfortran.dg/forall_17.f90 b/gcc/testsuite/gfortran.dg/forall_17.f90
new file mode 100644
index 000000000000..9b68d8568409
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/forall_17.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! { dg-options "-ffrontend-optimize" }
+! PR fortran/66385 - this used to ICE
+! Original test case by Mianzhi Wang
+program test
+  double precision::aa(30)
+  double precision::a(3,3),b
+  b=1d0
+  forall(i=1:3)
+    a(:,i)=b*[1d0,2d0,3d0]
+  end forall
+
+  forall(i=1:10)
+    aa(10*[0,1,2]+i)=1d0
+  end forall
+
+end program