aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2009-08-17 11:11:00 +0200
committerJanus Weil <janus@gcc.gnu.org>2009-08-17 11:11:00 +0200
commitb76e28c64d8a13f0fcaf6bddee53c06115c1d186 (patch)
treeb8373165dd65e8525462591a15c32863293ad590 /gcc/fortran/resolve.c
parente9d9afef6f725fc3444d2639c0961a70b1da54a0 (diff)
downloadgcc-b76e28c64d8a13f0fcaf6bddee53c06115c1d186.zip
gcc-b76e28c64d8a13f0fcaf6bddee53c06115c1d186.tar.gz
gcc-b76e28c64d8a13f0fcaf6bddee53c06115c1d186.tar.bz2
re PR fortran/40877 (memory leaks with gfc_charlen?)
2009-08-17 Janus Weil <janus@gcc.gnu.org> PR fortran/40877 * array.c (gfc_resolve_character_array_constructor): Add NULL argument to gfc_new_charlen. * decl.c (add_init_expr_to_sym,variable_decl,match_char_spec, gfc_match_implicit): Ditto. * expr.c (simplify_const_ref): Fix memory leak. (gfc_simplify_expr): Add NULL argument to gfc_new_charlen. * gfortran.h (gfc_new_charlen): Modified prototype. * iresolve.c (check_charlen_present,gfc_resolve_char_achar): Add NULL argument to gfc_new_charlen. * module.c (mio_charlen): Ditto. * resolve.c (gfc_resolve_substring_charlen, gfc_resolve_character_operator,fixup_charlen): Ditto. (resolve_fl_derived,resolve_symbol): Add argument to gfc_charlen. * symbol.c (gfc_new_charlen): Add argument 'old_cl' (to make a copy of an existing charlen). (gfc_set_default_type,generate_isocbinding_symbol): Fix memory leak. (gfc_copy_formal_args_intr): Add NULL argument to gfc_new_charlen. * trans-decl.c (create_function_arglist): Fix memory leak. From-SVN: r150823
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index ff32ae6..fb72b93 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -4129,7 +4129,7 @@ gfc_resolve_substring_charlen (gfc_expr *e)
e->ts.kind = gfc_default_character_kind;
if (!e->ts.u.cl)
- e->ts.u.cl = gfc_new_charlen (gfc_current_ns);
+ e->ts.u.cl = gfc_new_charlen (gfc_current_ns, NULL);
if (char_ref->u.ss.start)
start = gfc_copy_expr (char_ref->u.ss.start);
@@ -4602,7 +4602,7 @@ gfc_resolve_character_operator (gfc_expr *e)
else if (op2->expr_type == EXPR_CONSTANT)
e2 = gfc_int_expr (op2->value.character.length);
- e->ts.u.cl = gfc_new_charlen (gfc_current_ns);
+ e->ts.u.cl = gfc_new_charlen (gfc_current_ns, NULL);
if (!e1 || !e2)
return;
@@ -4641,7 +4641,7 @@ fixup_charlen (gfc_expr *e)
default:
if (!e->ts.u.cl)
- e->ts.u.cl = gfc_new_charlen (gfc_current_ns);
+ e->ts.u.cl = gfc_new_charlen (gfc_current_ns, NULL);
break;
}
@@ -9452,9 +9452,7 @@ resolve_fl_derived (gfc_symbol *sym)
/* Copy char length. */
if (ifc->ts.type == BT_CHARACTER && ifc->ts.u.cl)
{
- c->ts.u.cl = gfc_new_charlen (sym->ns);
- c->ts.u.cl->resolved = ifc->ts.u.cl->resolved;
- c->ts.u.cl->length = gfc_copy_expr (ifc->ts.u.cl->length);
+ c->ts.u.cl = gfc_new_charlen (sym->ns, ifc->ts.u.cl);
/* TODO: gfc_expr_replace_symbols (c->ts.u.cl->length, c);*/
}
}
@@ -9956,9 +9954,7 @@ resolve_symbol (gfc_symbol *sym)
/* Copy char length. */
if (ifc->ts.type == BT_CHARACTER && ifc->ts.u.cl)
{
- sym->ts.u.cl = gfc_new_charlen (sym->ns);
- sym->ts.u.cl->resolved = ifc->ts.u.cl->resolved;
- sym->ts.u.cl->length = gfc_copy_expr (ifc->ts.u.cl->length);
+ sym->ts.u.cl = gfc_new_charlen (sym->ns, ifc->ts.u.cl);
gfc_expr_replace_symbols (sym->ts.u.cl->length, sym);
}
}