Commit c130efd5 by Tobias Burnus Committed by Tobias Burnus

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
parent 33974673
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> 2010-08-04 Mikael Morin <mikael@gcc.gnu.org>
PR fortran/42051 PR fortran/42051
......
...@@ -936,11 +936,26 @@ resolve_structure_cons (gfc_expr *expr) ...@@ -936,11 +936,26 @@ resolve_structure_cons (gfc_expr *expr)
p = gfc_constructor_first (cons->expr->value.constructor); p = gfc_constructor_first (cons->expr->value.constructor);
if (cons->expr->ts.u.cl != p->expr->ts.u.cl) if (cons->expr->ts.u.cl != p->expr->ts.u.cl)
{ {
gfc_free_expr (cons->expr->ts.u.cl->length); gfc_charlen *cl, *cl2;
gfc_free (cons->expr->ts.u.cl);
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_from_typespec = true;
cons->expr->ts.u.cl->length = gfc_copy_expr (comp->ts.u.cl->length); cons->expr->ts.u.cl->length = gfc_copy_expr (comp->ts.u.cl->length);
gfc_resolve_character_array_constructor (cons->expr); gfc_resolve_character_array_constructor (cons->expr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment