diff options
| author | Erik Edelmann <eedelman@gcc.gnu.org> | 2005-10-30 22:43:45 +0000 |
|---|---|---|
| committer | Erik Edelmann <eedelman@gcc.gnu.org> | 2005-10-30 22:43:45 +0000 |
| commit | d48734ef2097ddc561d94a580fc953ee96ce64e9 (patch) | |
| tree | 102686eae7993678eeae05f49c9be9da67cf827f /gcc/fortran | |
| parent | 097588e4e451fa245febe7d8e8d70e93c4ec7cf4 (diff) | |
| download | gcc-d48734ef2097ddc561d94a580fc953ee96ce64e9.zip gcc-d48734ef2097ddc561d94a580fc953ee96ce64e9.tar.gz gcc-d48734ef2097ddc561d94a580fc953ee96ce64e9.tar.bz2 | |
re PR fortran/18883 (ICE in gfc_finish_var_decl)
fortran/
2005-10-30 Erik Edelmann <eedelman@gcc.gnu.org>
PR fortran/18883
* trans-decl.c (gfc_finish_var_decl): Add decl to the
current function, rather than the parent. Make
assertion accept fake result variables.
* trans-expr.c (gfc_conv_variable): If the character
length of an ENTRY isn't set, get the length from
the master function instead.
testsuite
2005-10-30 Erik Edelmann <eedelman@gcc.gnu.org>
PR fortran/18883
* gfortran.dg/char_result_9.f90: New.
* gfortran.dg/char_result_10.f90: New.
From-SVN: r106254
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 7 |
3 files changed, 19 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5711cf6..03441c7 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2005-10-30 Erik Edelmann <eedelman@gcc.gnu.org> + + PR fortran/18883 + * trans-decl.c (gfc_finish_var_decl): Add decl to the + current function, rather than the parent. Make + assertion accept fake result variables. + * trans-expr.c (gfc_conv_variable): If the character + length of an ENTRY isn't set, get the length from + the master function instead. + 2005-10-30 Thomas Koenig <Thomas.Koenig@online.de> * gfortran.texi: Remove reservations about I/O usability. Document diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index ff69954..dce4095 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -469,7 +469,8 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym) function scope. */ if (current_function_decl != NULL_TREE) { - if (sym->ns->proc_name->backend_decl == current_function_decl) + if (sym->ns->proc_name->backend_decl == current_function_decl + || sym->result == sym) gfc_add_decl_to_function (decl); else gfc_add_decl_to_parent_function (decl); @@ -487,7 +488,7 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym) else if (sym->module && !sym->attr.result && !sym->attr.dummy) { /* TODO: Don't set sym->module for result or dummy variables. */ - gcc_assert (current_function_decl == NULL_TREE); + gcc_assert (current_function_decl == NULL_TREE || sym->result == sym); /* This is the declaration of a module variable. */ TREE_PUBLIC (decl) = 1; TREE_STATIC (decl) = 1; diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index fe5e24b..f911487 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -403,7 +403,12 @@ gfc_conv_variable (gfc_se * se, gfc_expr * expr) /* For character variables, also get the length. */ if (sym->ts.type == BT_CHARACTER) { - se->string_length = sym->ts.cl->backend_decl; + /* If the character length of an entry isn't set, get the length from + the master function instead. */ + if (sym->attr.entry && !sym->ts.cl->backend_decl) + se->string_length = sym->ns->proc_name->ts.cl->backend_decl; + else + se->string_length = sym->ts.cl->backend_decl; gcc_assert (se->string_length); } |