re PR fortran/85641 (ICE with string concatenate)

2018-06-07  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/85641
	Backport from trunk.
	* frontend-passes.c (is_fe_temp): Add prototype.
	(realloc_string_callback): Early return for frontend-generated
	temporary.

2018-06-07  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/85641
	Backport from trunk.
	* gfortran.dg/realloc_on_assign_30.f90: New test.

From-SVN: r261289

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4e4aac4c4a57990c3523ef046dbcb3ac49939eb9..7bafde9510b6b75e0d935600602006b9f3e7b2d9 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-07  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/85641
+       Backport from trunk.
+       * frontend-passes.c (is_fe_temp): Add prototype.
+       (realloc_string_callback): Early return for frontend-generated
+       temporary.
+
 2018-06-04  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/85981

diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index d7b4f23fe89b227a9a4513355a373147200dc88e..ef1d8f97434d018899bf5f5d6408bdca12365749 100644 (file)
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -48,6 +48,8 @@ static gfc_code * create_do_loop (gfc_expr *, gfc_expr *, gfc_expr *,
                                  locus *, gfc_namespace *,
                                  char *vname=NULL);
 
+static bool is_fe_temp (gfc_expr *e);
+
 #ifdef CHECKING_P
 static void check_locus (gfc_namespace *);
 #endif
@@ -231,6 +233,9 @@ realloc_string_callback (gfc_code **c, int *walk_subtrees ATTRIBUTE_UNUSED,
       || !expr1->ts.deferred)
     return 0;
 
+  if (is_fe_temp (expr1))
+    return 0;
+
   expr2 = gfc_discard_nops (co->expr2);
 
   if (expr2->expr_type == EXPR_VARIABLE)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index df89b1f06c902c3ef851627bd14f62366b3dd1b0..0e63798b22d65751beb9d13ef81d8ca6f8e02def 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-07  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/85641
+       Backport from trunk.
+       * gfortran.dg/realloc_on_assign_30.f90: New test.
+
 2018-06-07  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_30.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_30.f90
new file mode 100644 (file)
index 0000000..4e7eb4b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_30.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! PR 85641 - this used to ICE due do infinite recursion.
+! Test case by Antony Lewis.
+program tester
+character(LEN=:), allocatable :: fields
+integer j
+character(LEN=4), parameter :: CMB_CL_Fields = 'TEBP'
+
+fields = ''
+j=1
+fields = fields // CMB_CL_Fields(j:j)
+
+end program tester