diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/frontend-passes.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/realloc_on_assign_26.f90 | 12 |
4 files changed, 26 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9d2c94b..54950be 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 2016-02-28 Thomas Koenig <tkoenig@gcc.gnu.org> + PR fortran/68147 + PR fortran/47674 + * frontend-passes.c (realloc_string_callback): Don't set + walk_subtrees. + +2016-02-28 Thomas Koenig <tkoenig@gcc.gnu.org> + * dump-parse-tree.c (show_code_node): Print association list of a block if present. Handle EXEC_END_BLOCK. diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 156ea2b..7eeb5a6 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 6dcb331..3a56e66 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-02-28 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/68147 + PR fortran/47674 + * gfortran.dg/realloc_on_assign_26.f90: New test case. + 2016-02-28 Harald Anlauf <anlauf@gmx.de> Jerry DeLisle <jvdelisle@gcc.gnu.org> 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 0000000..4791c24 --- /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 |