re PR fortran/71783 (ICE on valid code in gimplify_var_or_parm_decl at gimplify.c...

2016-07-09  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/71783
	* frontend-passes.c (create_var):  Always allocate a charlen
	for character variables.

2016-07-09  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/71783
	* gfortran.dg/dependency_46.f90:  New test.

From-SVN: r238192

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 61bd1afcbd4ba59457540561ea8cb02ccad3aa10..8b71025d7acf33537f6927cdac3f80b501435db3 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/71783
+       * frontend-passes.c (create_var):  Always allocate a charlen
+       for character variables.
+
 2016-07-08  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/68426

diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index f02a52ace8b2a614dfc03c4caeb9b23c98e6d1bb..9ae3421da057306ca2cbfcd182fb2658665c8b18 100644 (file)
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -665,12 +665,10 @@ create_var (gfc_expr * e, const char *vname)
     {
       gfc_expr *length;
 
+      symbol->ts.u.cl = gfc_new_charlen (ns, NULL);
       length = constant_string_length (e);
       if (length)
-       {
-         symbol->ts.u.cl = gfc_new_charlen (ns, NULL);
-         symbol->ts.u.cl->length = length;
-       }
+       symbol->ts.u.cl->length = length;
       else
        symbol->attr.allocatable = 1;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1d835813da8ce79647dee561f7ef4e85ed830740..63333ba01aa46bcbb10043be55b7b292465fd20a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/71783
+       * gfortran.dg/dependency_46.f90:  New test.
+
 2016-07-08  Vladimir Makarov  <vmakarov@redhat.com>
 
        PR rtl-optimization/71621

diff --git a/gcc/testsuite/gfortran.dg/dependency_46.f90 b/gcc/testsuite/gfortran.dg/dependency_46.f90
new file mode 100644 (file)
index 0000000..28942a8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dependency_46.f90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+! PR 71783 - this used to ICE due to a missing charlen for the temporary.
+! Test case by Toon Moene.
+
+SUBROUTINE prtdata(ilen)
+  INTEGER :: ilen
+  character(len=ilen), allocatable :: cline(:)
+  allocate(cline(2))
+  cline(1) = 'a'
+  cline(2) = cline(1)
+END SUBROUTINE prtdata