From 2c6dce924ac4ab09c09c48a94515efe305806025 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Tue, 9 Aug 2016 06:28:57 +0000 Subject: [PATCH] backport: re PR fortran/69742 (ICE with -O3 and ASSOCIATE containing repeated expression) 2016-08-09 Thomas Koenig Backport from trunk PR fortran/69742 * frontend-passes.c (cfe-expr_0): Don't register functions from within an ASSOCIATE statement. 2016-08-09 Thomas Koenig PR fortran/69742 * gfortran.dg/associate_21.f90: New test. From-SVN: r239271 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/frontend-passes.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/associate_21.f90 | 19 +++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/associate_21.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 67ec56c5a009..6881684d1268 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-08-09 Thomas Koenig + + Backport from trunk + PR fortran/69742 + * frontend-passes.c (cfe-expr_0): Don't register functions + from within an ASSOCIATE statement. + 2016-08-08 Thomas Koenig Backport from trunk diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 92a1f9b75eb2..31d7caf66893 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -711,7 +711,7 @@ cfe_expr_0 (gfc_expr **e, int *walk_subtrees, /* Don't do this optimization within OMP workshare. */ - if (in_omp_workshare) + if (in_omp_workshare || in_assoc_list) { *walk_subtrees = 0; return 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4765fce5e339..a7ee12126ac2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-08-09 Thomas Koenig + + PR fortran/69742 + * gfortran.dg/associate_21.f90: New test. + 2016-08-08 Thomas Koenig PR fortran/60526 diff --git a/gcc/testsuite/gfortran.dg/associate_21.f90 b/gcc/testsuite/gfortran.dg/associate_21.f90 new file mode 100644 index 000000000000..a7bbabab4318 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/associate_21.f90 @@ -0,0 +1,19 @@ +! { dg-do compile } +! { dg-options "-ffrontend-optimize" } +! PR 69742 - this used to ICE with front-end optimizatoin +! Original test case by Marco Restelli. +program p + implicit none + integer, allocatable :: i(:), j + + allocate( i(5) ) + i = (/( j , j=1,5 )/) + + ! The ICE appears when "size(i)" is used twice in associate + associate( i5 => i(size(i):size(i)) ) ! this gives ICE + !associate( i5 => i(size(2*i):size(i)) ) ! this works + i5 = 2 + end associate + + write(*,*) i +end program p -- 2.47.2