From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Sun, 25 Nov 2018 15:23:18 +0000 (+0000)
Subject: backport: re PR fortran/88073 (Internal compiler error  compiling WHERE construct... 
X-Git-Tag: releases/gcc-7.4.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3262f0e070b8c489187496999e1bc89eee88816d;p=thirdparty%2Fgcc.git

backport: re PR fortran/88073 (Internal compiler error  compiling WHERE construct with -O or -O2)

2018-11-25  Thomas Koenig  <tkoenig@gcc.gnu.org>

	Backport from trunk
	PR fortran/88073
	* frontend-passes.c (combine_array_constructor): Do not do
	anything if in a WHERE statement.

2018-11-25  Thomas Koenig  <tkoenig@gcc.gnu.org>

	Backport from trunk
	PR fortran/88073
	* gfortran.dg/where_7.f90: New test.

From-SVN: r266437
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 95f097cad1ec..fb9f19621525 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-25  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	Backport from trunk
+	PR fortran/88073
+	* frontend-passes.c (combine_array_constructor): Do not do
+	anything if in a WHERE statement.
+
 2018-11-24  Paul Thomas  <pault@gcc.gnu.org>
 
 	Backport from mainline
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index ef1d8f97434d..7c83a882ecc1 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -1358,6 +1358,10 @@ combine_array_constructor (gfc_expr *e)
   if (iterator_level > 0)
     return false;
 
+  /* WHERE also doesn't work.  */
+  if (in_where > 0)
+    return false;
+
   op1 = e->value.op.op1;
   op2 = e->value.op.op2;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d3dbd150a50..798ad9565e5b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-25  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	Backport from trunk
+	PR fortran/88073
+	* gfortran.dg/where_7.f90: New test.
+
 2018-11-24  Paul Thomas  <pault@gcc.gnu.org>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gfortran.dg/where_7.f90 b/gcc/testsuite/gfortran.dg/where_7.f90
new file mode 100644
index 000000000000..1c79ef505533
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/where_7.f90
@@ -0,0 +1,25 @@
+! { dg-do compile }
+! { dg-options "-ffrontend-optimize" }
+! PR fortran/88073 - this used to ICE with front-end optimization
+! Original test case by 'mecej4'
+Subroutine tfu (n, x, f)
+   Implicit None
+   Integer, Parameter :: double = Kind (0.d0)
+   Integer, Intent (In) :: n
+   Real (double), Intent (Out) :: f
+   Real (double), Intent (In) :: x (n)
+   Integer :: j
+   Logical, Dimension(n) :: l1v, l2v, l3v
+!
+   l3v = .False.
+   l2v = .False.
+   l1v = (/ (j, j=1, n) /) == 1
+   Where ( .Not. (l1v))
+      l2v = (/ (j, j=1, n) /) == n
+   End Where
+   Where ( .Not. l1v)
+      l3v = .Not. l2v
+   End Where
+   f = sum (x(1:n), mask=l3v)
+   Return
+end subroutine tfu