From: Tobias Burnus <burnus@net-b.de>
Date: Wed, 4 Aug 2010 18:49:23 +0000 (+0200)
Subject: re PR fortran/45183 (FAIL: gfortran.dg/derived_constructor_char_1.f90)
X-Git-Tag: releases/gcc-4.6.0~5256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c130efd5b9294f1420b1df0cedb3e92605daab76;p=thirdparty%2Fgcc.git

re PR fortran/45183 (FAIL: gfortran.dg/derived_constructor_char_1.f90)

2010-08-04  Tobias Burnus  <burnus@net-b.de>

        PR fortran/45183
        PR fortran/44857
        * resolve.c (resolve_structure_cons): Fix
        freeing of charlen.

From-SVN: r162871
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ecf0ff257f29..7504f491af30 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-04  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/45183
+	PR fortran/44857
+	* resolve.c (resolve_structure_cons): Fix
+	freeing of charlen.
+
 2010-08-04  Mikael Morin  <mikael@gcc.gnu.org>
 
 	PR fortran/42051
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 620df03a34d4..c422eebc27f3 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -936,11 +936,26 @@ resolve_structure_cons (gfc_expr *expr)
 	      p = gfc_constructor_first (cons->expr->value.constructor);
 	      if (cons->expr->ts.u.cl != p->expr->ts.u.cl)
 		{
-		  gfc_free_expr (cons->expr->ts.u.cl->length);
-		  gfc_free (cons->expr->ts.u.cl);
+		  gfc_charlen *cl, *cl2;
+
+		  cl2 = NULL;
+		  for (cl = gfc_current_ns->cl_list; cl; cl = cl->next)
+		    {
+		      if (cl == cons->expr->ts.u.cl)
+			break;
+		      cl2 = cl;
+		    }
+
+		  gcc_assert (cl);
+
+		  if (cl2)
+		    cl2->next = cl->next;
+
+		  gfc_free_expr (cl->length);
+		  gfc_free (cl);
 		}
 
-	      cons->expr->ts.u.cl = gfc_get_charlen ();
+	      cons->expr->ts.u.cl = gfc_new_charlen (gfc_current_ns, NULL);
 	      cons->expr->ts.u.cl->length_from_typespec = true;
 	      cons->expr->ts.u.cl->length = gfc_copy_expr (comp->ts.u.cl->length);
 	      gfc_resolve_character_array_constructor (cons->expr);