From 7b201a88a3a939417df94dedcb766c9b949bf9be Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sun, 28 Feb 2016 22:27:55 +0000 Subject: [PATCH] re PR fortran/68147 (Potential incorrect code generation for string self-assignment) 2016-02-28 Thomas Koenig PR fortran/68147 PR fortran/47674 * frontend-passes.c (realloc_string_callback): Don't set walk_subtrees. 2016-02-28 Thomas Koenig PR fortran/68147 PR fortran/47674 * gfortran.dg/realloc_on_assign_26.f90: New test case. From-SVN: r233797 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/frontend-passes.c | 3 +-- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/realloc_on_assign_26.f90 | 12 ++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/realloc_on_assign_26.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9d2c94bc2bf1..54950beffd2a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-02-28 Thomas Koenig + + PR fortran/68147 + PR fortran/47674 + * frontend-passes.c (realloc_string_callback): Don't set + walk_subtrees. + 2016-02-28 Thomas Koenig * dump-parse-tree.c (show_code_node): Print association diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 156ea2b76402..7eeb5a68aa2b 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -153,14 +153,13 @@ gfc_run_passes (gfc_namespace *ns) */ static int -realloc_string_callback (gfc_code **c, int *walk_subtrees, +realloc_string_callback (gfc_code **c, int *walk_subtrees ATTRIBUTE_UNUSED, void *data ATTRIBUTE_UNUSED) { gfc_expr *expr1, *expr2; gfc_code *co = *c; gfc_expr *n; - *walk_subtrees = 0; if (co->op != EXEC_ASSIGN) return 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6dcb33134523..3a56e66ac889 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-02-28 Thomas Koenig + + PR fortran/68147 + PR fortran/47674 + * gfortran.dg/realloc_on_assign_26.f90: New test case. + 2016-02-28 Harald Anlauf Jerry DeLisle diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_26.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_26.f90 new file mode 100644 index 000000000000..4791c24e14f2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_26.f90 @@ -0,0 +1,12 @@ +! { dg-do run } +! PR 68147 - no temprorary within the IF statement. +! Original test case by Martin Reinecke. +program test + implicit none + character(len=:),allocatable ::name + name="./a.out" + if (index(name,"/") /= 0) THEN + name=name(3:) + if (name .ne. "a.out") call abort + endif +end program -- 2.47.2