diff options
| author | Louis Krupp <louis.krupp@zoho.com> | 2016-09-15 23:54:40 +0000 |
|---|---|---|
| committer | Louis Krupp <lkrupp@gcc.gnu.org> | 2016-09-15 23:54:40 +0000 |
| commit | 902d624f45c2be8ca865017539f0c224c913f146 (patch) | |
| tree | 003f7251ae57f2b83a725e28aadc9336f98c298e /gcc/fortran/parse.c | |
| parent | 931388ce2da09aefdf573cfd79d41111ccc79eb1 (diff) | |
| download | gcc-902d624f45c2be8ca865017539f0c224c913f146.zip gcc-902d624f45c2be8ca865017539f0c224c913f146.tar.gz gcc-902d624f45c2be8ca865017539f0c224c913f146.tar.bz2 | |
re PR fortran/69963 (ICE out of memory on displaced implicit character)
2016-09-15 Louis Krupp <louis.krupp@zoho.com>
PR fortran/69963
* parse.c (reject_statement): Clear charlen pointers in implicit
character typespecs before those charlen structures are freed.
2016-09-15 Louis Krupp <louis.krupp@zoho.com>
PR fortran/69963
* gfortran.dg/misplaced_implicit_character.f90: New test.
From-SVN: r240168
Diffstat (limited to 'gcc/fortran/parse.c')
| -rw-r--r-- | gcc/fortran/parse.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 86f2c42..d78a2c0 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -2399,6 +2399,29 @@ accept_statement (gfc_statement st) } +/* Clear default character types with charlen pointers that are about + to become invalid. */ + +static void +clear_default_charlen (gfc_namespace *ns, const gfc_charlen *cl, + const gfc_charlen *end) +{ + gfc_typespec *ts; + + for (ts = &ns->default_type[0]; ts < &ns->default_type[GFC_LETTERS]; ts++) + if (ts->type == BT_CHARACTER) + { + const gfc_charlen *cl2; + for (cl2 = cl; cl2 != end; cl2 = cl2->next) + if (ts->u.cl == cl2) + { + ts->u.cl = NULL; + ts->type = BT_UNKNOWN; + break; + } + } +} + /* Undo anything tentative that has been built for the current statement. */ @@ -2406,6 +2429,8 @@ static void reject_statement (void) { /* Revert to the previous charlen chain. */ + clear_default_charlen (gfc_current_ns, + gfc_current_ns->cl_list, gfc_current_ns->old_cl_list); gfc_free_charlen (gfc_current_ns->cl_list, gfc_current_ns->old_cl_list); gfc_current_ns->cl_list = gfc_current_ns->old_cl_list; |