From dc2c36fd935fd50c97bb03b5e3e2a9683f4271d1 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Thu, 21 Aug 2014 18:52:58 +0000 Subject: [PATCH] re PR fortran/62214 (Problem with spread plus concatenation for characters) 2014-08-21 Thomas Koenig PR fortran/62214 * frontend-passes.c (optimize_binop_array_assignment): Do not try to optimize the array assignment for string concatenation. 2014-08-21 Thomas Koenig PR fortran/62214 * gfortran.dg/array_assignment_5.f90: New test. From-SVN: r214281 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/frontend-passes.c | 4 ++++ gcc/testsuite/ChangeLog | 7 ++++++- gcc/testsuite/gfortran.dg/array_assignment_5.f90 | 16 ++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/array_assignment_5.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 91330ffdd5f7..fcb4a7bb6980 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2014-08-21 Thomas Koenig + + PR fortran/62214 + * frontend-passes.c (optimize_binop_array_assignment): + Do not try to optimize the array assignment for string + concatenation. + 2014-08-21 Manuel López-Ibáñez PR fortran/44054 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index edf63486784e..23a8ece17ee8 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -903,6 +903,10 @@ optimize_binop_array_assignment (gfc_code *c, gfc_expr **rhs, bool seen_op) return true; break; + case INTRINSIC_CONCAT: + /* Do not do string concatenations. */ + break; + default: /* Binary operators. */ if (optimize_binop_array_assignment (c, &e->value.op.op1, true)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 222da32c1e27..53fed571851c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-08-21 Thomas Koenig + + PR fortran/62214 + * gfortran.dg/array_assignment_5.f90: New test. + 2014-08-21 Sandra Loosemore * lib/target-supports.exp @@ -9,7 +14,7 @@ * gcc.dg/tree-ssa/interposition.c: Require fpic effective target for test using -fPIC. * gcc.dg/lto/pr61526_0.c: Likewise. - + 2014-08-21 Jan Hubicka PR tree-optimization/62091 diff --git a/gcc/testsuite/gfortran.dg/array_assignment_5.f90 b/gcc/testsuite/gfortran.dg/array_assignment_5.f90 new file mode 100644 index 000000000000..6d585270ceac --- /dev/null +++ b/gcc/testsuite/gfortran.dg/array_assignment_5.f90 @@ -0,0 +1,16 @@ +! { dg-do run } +! { dg-options "-ffrontend-optimize" } +! PR 62214 - this used to give the wrong result. +! Original test case by Oliver Fuhrer +PROGRAM test + IMPLICIT NONE + CHARACTER(LEN=20) :: fullNames(2) + CHARACTER(LEN=255) :: pathName + CHARACTER(LEN=5) :: fileNames(2) + + pathName = "/dir1/dir2/" + fileNames = (/ "file1", "file2" /) + fullNames = SPREAD(TRIM(pathName),1,2) // fileNames + if (fullNames(1) /= '/dir1/dir2/file1' .or. & + & fullnames(2) /= '/dir1/dir2/file2') call abort +END PROGRAM test -- 2.47.2