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 <[email protected]>
PR fortran/88073
* frontend-passes.c (combine_array_constructor): Do not do
anything if in a WHERE statement.
2018-11-18 Thomas Koenig <[email protected]>
PR fortran/88073
* gfortran.dg/where_7.f90: New test.
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;
! { 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
