diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dependency_45.f90 | 12 |
4 files changed, 30 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6912797..d7a76a3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-12-28 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/56867 + * trans-array.c (gfc_conv_resolve_dependencies): Also check + dependencies when there may be substrings of character arrays. + 2014-12-27 Janus Weil <janus@gcc.gnu.org> PR fortran/54756 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 67beab2..ebd7f11 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -4355,6 +4355,13 @@ gfc_conv_resolve_dependencies (gfc_loopinfo * loop, gfc_ss * dest, && ss_expr->rank) nDepend = gfc_check_dependency (dest_expr, ss_expr, true); + /* Check for cases like c(:)(1:2) = c(2)(2:3) */ + if (!nDepend && dest_expr->rank > 0 + && dest_expr->ts.type == BT_CHARACTER + && ss_expr->expr_type == EXPR_VARIABLE) + + nDepend = gfc_check_dependency (dest_expr, ss_expr, false); + continue; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4422c96..ebcfdc4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-12-28 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/56867 + * gfortran.dg/dependency_45.f90: New test. + 2014-12-27 Janus Weil <janus@gcc.gnu.org> PR fortran/54756 diff --git a/gcc/testsuite/gfortran.dg/dependency_45.f90 b/gcc/testsuite/gfortran.dg/dependency_45.f90 new file mode 100644 index 0000000..8b43f75 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/dependency_45.f90 @@ -0,0 +1,12 @@ +! { dg-do run } +! { dg-options "-Warray-temporaries" } +! PR 56867 - substrings were not checked for dependency. +program main + character(len=4) :: a + character(len=4) :: c(3) + c(1) = 'abcd' + c(2) = '1234' + c(3) = 'wxyz' + c(:)(1:2) = c(2)(2:3) ! { dg-warning "array temporary" } + if (c(3) .ne. '23yz') call abort +end program main |