From dd30dee82d03a20e79c0fcd97a8fb8d52bf6307d Mon Sep 17 00:00:00 2001 From: tkoenig Date: Sun, 28 Dec 2014 12:03:02 +0000 Subject: [PATCH] 2014-12-28 Thomas Koenig PR fortran/56867 * trans-array.c (gfc_conv_resolve_dependencies): Also check dependencies when there may be substrings of character arrays. 2014-12-28 Thomas Koenig PR fortran/56867 * gfortran.dg/dependency_45.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219089 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-array.c | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/dependency_45.f90 | 12 ++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/dependency_45.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6912797a456..d7a76a3c9f9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-12-28 Thomas Koenig + + 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 PR fortran/54756 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 67beab291a1..ebd7f11a53b 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 4422c960deb..ebcfdc4c769 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-12-28 Thomas Koenig + + PR fortran/56867 + * gfortran.dg/dependency_45.f90: New test. + 2014-12-27 Janus Weil 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 00000000000..8b43f7507b6 --- /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 -- 2.11.4.GIT