From df9d440f62cfaa3d65b7144f4172feebe891e7c8 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sat, 24 Jan 2015 21:30:15 +0000 Subject: [PATCH] re PR fortran/56867 (Missing temporary with string array assignment) 2015-01-24 Thomas Koenig PR fortran/56867 * trans-array.c (gfc_conv_resolve_dependencies): Also check dependencies when there may be substrings of character arrays. 2015-01-24 Thomas Koenig PR fortran/56867 * gfortran.dg/dependency_45.f90: New test. From-SVN: r220085 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-array.c | 13 +++++++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/dependency_45.f90 | 12 ++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/dependency_45.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 646a68db592d..93db3380c7d8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2015-01-24 Thomas Koenig + + PR fortran/56867 + * trans-array.c (gfc_conv_resolve_dependencies): Also check + dependencies when there may be substrings of character arrays. + 2015-01-24 Thomas Koenig Backport from trunk diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 8da24a2578f1..00b1c36e7471 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -4299,11 +4299,20 @@ gfc_conv_resolve_dependencies (gfc_loopinfo * loop, gfc_ss * dest, for (ss = rss; ss != gfc_ss_terminator; ss = ss->next) { - if (ss->info->type != GFC_SS_SECTION) - continue; ss_expr = ss->info->expr; + if (ss->info->type != GFC_SS_SECTION) + { + /* 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; + } + if (dest_expr->symtree->n.sym != ss_expr->symtree->n.sym) { if (gfc_could_be_alias (dest, ss) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index eda05176e06e..f55d90c46d15 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-01-24 Thomas Koenig + + PR fortran/56867 + * gfortran.dg/dependency_45.f90: New test. + 2015-01-24 Thomas Koenig Backport from trunk diff --git a/gcc/testsuite/gfortran.dg/dependency_45.f90 b/gcc/testsuite/gfortran.dg/dependency_45.f90 new file mode 100644 index 000000000000..8b43f7507b6f --- /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.47.2