diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2013-04-08 19:36:43 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2013-04-08 19:36:43 +0000 |
| commit | a2d0800a410ddd6dd321fd6b92c0e21f029fcbab (patch) | |
| tree | 215bf2c76484ac343ef397d3ddb0d5780a8a0b55 | |
| parent | 0c3f68a025fc9d41a615854c21c6f2363739c066 (diff) | |
| download | gcc-a2d0800a410ddd6dd321fd6b92c0e21f029fcbab.zip gcc-a2d0800a410ddd6dd321fd6b92c0e21f029fcbab.tar.gz gcc-a2d0800a410ddd6dd321fd6b92c0e21f029fcbab.tar.bz2 | |
re PR fortran/56872 (Incorrect SUM evaluation, involving implied-do loop, with -ffrontend-optimize)
2013-04-08 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/56782
* frontend-passes.c (callback_reduction): Dont't do
any simplification if there is only a single element
which has an iterator.
2013-04-08 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/56782
* gfortran.dg/array_constructor_44.f90: New test.
From-SVN: r197610
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/frontend-passes.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/array_constructor_44.f90 | 12 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index bf6f7d8..538ce47 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2013-04-08 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/56782 + * frontend-passes.c (callback_reduction): Dont't do + any simplification if there is only a single element + which has an iterator. + 2013-04-07 Tobias Burnus <burnus@net-b.de> PR fortran/56849 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index a77afc5..b2d0116 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -300,7 +300,12 @@ callback_reduction (gfc_expr **e, int *walk_subtrees ATTRIBUTE_UNUSED, c = gfc_constructor_first (arg->value.constructor); - if (c == NULL) + /* Don't do any simplififcation if we have + - no element in the constructor or + - only have a single element in the array which contains an + iterator. */ + + if (c == NULL || (c->iterator != NULL && gfc_constructor_next (c) == NULL)) return 0; res = copy_walk_reduction_arg (c->expr, fn); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9fdbdfc..7393517 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-04-08 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/56782 + * gfortran.dg/array_constructor_44.f90: New test. + 2013-04-08 Paolo Carlini <paolo.carlini@oracle.com> PR c++/56871 diff --git a/gcc/testsuite/gfortran.dg/array_constructor_44.f90 b/gcc/testsuite/gfortran.dg/array_constructor_44.f90 new file mode 100644 index 0000000..e0cffd1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/array_constructor_44.f90 @@ -0,0 +1,12 @@ +! { dg-do run } +! { dg-options "-ffrontend-optimize" } +! PR 56872 - wrong front-end optimization with a single constructor. +! Original bug report by Rich Townsend. + integer :: k + real :: s + integer :: m + s = 2.0 + m = 4 + res = SUM([(s**(REAL(k-1)/REAL(m-1)),k=1,m)]) + if (abs(res - 5.84732246) > 1e-6) call abort + end |