OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tobias Burnus 2010-08-04 20:49:23 +02:00 committed by Tobias Burnus
parent 339746734a
commit c130efd5b9
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View File

@ -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

21
gcc/fortran/resolve.c
View File

@ -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);