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

2015-06-05  Thomas Koenig  <tkoenig@gcc.gnu.org>

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

2015-06-05  Thomas Koenig  <tkoenig@gcc.gnu.org>

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

From-SVN: r224172

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c4958ee1d5fc7fb53c85a5e4a3c78f0753317c04..35d3ce67be9e9c94cd837863fa818dbbd6135dac 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-05  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/66385
+       * frontend-passes.c (combine_array_constructor): Return early if
+       inside a FORALL loop.
+
 2015-06-05  Aldy Hernandez  <aldyh@redhat.com>
 
        * f95-lang.c (gfc_write_global_declarations): Remove.

diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index 45b053e665b8f09d678e9f8cfff34bf64f2ba4d8..3eda42f70a9a3f6c60275ae3d2d01e4657b109b3 100644 (file)
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -1243,6 +1243,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 334d4091be8d7fc2bfb8116e8d5787222e05f32d..e1a415ae5cd0653d6f3cb4db6b3cb9a7f453d7c4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-05  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/66385
+       * gfortran.dg/forall_17.f90:  New test.
+
 2015-06-05  Aldy Hernandez  <aldyh@redhat.com>
 
        * g++.dg/cpp0x/pr57101.C: Add warning.

diff --git a/gcc/testsuite/gfortran.dg/forall_17.f90 b/gcc/testsuite/gfortran.dg/forall_17.f90
new file mode 100644 (file)
index 0000000..9b68d85
--- /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