re PR fortran/77915 (Internal error for matmul() in forall with optimization)

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

	PR fortran/77915
	* frontend-passes.c (inline_matmul_assign):  Return early if
	inside a FORALL statement.

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

	PR fortran/77915
	* gfortran.dg/matmul_11.f90:  New test.

From-SVN: r240928

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 49054dd9955caa9ba4ca3e7c6378c779b340e5b3..0c54c6bdae6a17efbdc088de77a6f902839c3411 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/77915
+       * frontend-passes.c (inline_matmul_assign):  Return early if
+       inside a FORALL statement.
+
 2016-10-07  Fritz Reese  <fritzoreese@gmail.com>
 
        * interface.c (compare_components): Check charlen for BT_CHAR.

diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index 54b85544459e72708987cecf17139f0ea315ff4a..53b3c546f887894586a86e3a2a6553a7498ea0b8 100644 (file)
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -2857,6 +2857,11 @@ inline_matmul_assign (gfc_code **c, int *walk_subtrees,
   if (in_where)
     return 0;
 
+  /* The BLOCKS generated for the temporary variables and FORALL don't
+     mix.  */
+  if (forall_level > 0)
+    return 0;
+
   /* For now don't do anything in OpenMP workshare, it confuses
      its translation, which expects only the allowed statements in there.
      We should figure out how to parallelize this eventually.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 20c7aec71ba7e67ba1d3b164042658c8dd0f4441..04966cfbe5cd0b67a46c1d978f65fe8a8e36e3f9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/77915
+       * gfortran.dg/matmul_11.f90:  New test.
+
 2016-10-10  Jiong Wang  <jiong.wang@arm.com>
 
        * gcc.target/aarch64/advsimd-intrinsics/unary_scalar_op.inc: Support FMT64.

diff --git a/gcc/testsuite/gfortran.dg/matmul_11.f90 b/gcc/testsuite/gfortran.dg/matmul_11.f90
new file mode 100644 (file)
index 0000000..6907fa1
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/matmul_11.f90
@@ -0,0 +1,14 @@
+! { dg-do compile }
+! { dg-options "-ffrontend-optimize -fdump-tree-original" }
+! PR 77915 - ICE of matmul with forall.
+program x
+  integer, parameter :: d = 3
+  real,dimension(d,d,d) :: cube,xcube
+  real, dimension(d,d) :: cmatrix
+  integer :: i,j
+  forall(i=1:d,j=1:d)
+     xcube(i,j,:) = matmul(cmatrix,cube(i,j,:))
+  end forall
+end program x
+
+! { dg-final { scan-tree-dump-times "_gfortran_matmul" 1 "original" } }