diff mbox series

[committed] Fix PR 88073

Message ID 5f90469e-b3f3-88d4-7d73-bcceb6c851cd@netcologne.de
State New
Headers show
Series [committed] Fix PR 88073 | expand

Commit Message

Thomas Koenig Nov. 18, 2018, 5:46 p.m. UTC 
Hello world,

using the combined superpowers of Captain Obvious and Lieutenant Simple,
I have committed the attached patch, which fixes a regression, as
r266251, after regression-testing. I will backport to 8 and 7 in the
next few days.

Regards

	Thomas

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

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

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

         PR fortran/88073
         * gfortran.dg/where_7.f90: New test.
diff mbox series

Patch

Index: frontend-passes.c
===================================================================
--- frontend-passes.c	(Revision 266250)
+++ frontend-passes.c	(Arbeitskopie)
@@ -1773,6 +1773,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;