aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/parse.c
diff options
context:
space:
mode:
authorMikael Morin <mikael.morin@tele2.fr>2008-11-16 21:44:33 +0100
committerMikael Morin <mikael@gcc.gnu.org>2008-11-16 20:44:33 +0000
commit27f31e397edbaa44a6ab0d68af7799ea3f482755 (patch)
tree6d13df743abbd4b43ab0b67872d02dcdfb44bdc3 /gcc/fortran/parse.c
parent7cc003b5c2ebc9b2573ab75fc1a18874c7288b63 (diff)
downloadgcc-27f31e397edbaa44a6ab0d68af7799ea3f482755.zip
gcc-27f31e397edbaa44a6ab0d68af7799ea3f482755.tar.gz
gcc-27f31e397edbaa44a6ab0d68af7799ea3f482755.tar.bz2
re PR fortran/37992 (ICE while resolving charlen for rejected statements)
2008-11-16 Mikael Morin <mikael.morin@tele2.fr> PR fortran/37992 * gfortran.h (gfc_namespace): Added member old_cl_list, backup of cl_list. (gfc_free_charlen): Added prototype. * symbol.c (gfc_free_charlen): New function. (gfc_free_namespace): Use gfc_free_charlen. * parse.c (next_statement): Backup gfc_current_ns->cl_list. (reject_statement): Restore gfc_current_ns->cl_list. Free cl_list's elements before dropping them. 2008-11-16 Mikael Morin <mikael.morin@tele2.fr> PR fortran/37992 * gfotran.dg/charlen_free_1.f90: New test. From-SVN: r141927
Diffstat (limited to 'gcc/fortran/parse.c')
-rw-r--r--gcc/fortran/parse.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index e52c06f..954a22f 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -807,6 +807,7 @@ next_statement (void)
locus old_locus;
gfc_new_block = NULL;
+ gfc_current_ns->old_cl_list = gfc_current_ns->cl_list;
for (;;)
{
gfc_statement_label = NULL;
@@ -1512,6 +1513,10 @@ accept_statement (gfc_statement st)
static void
reject_statement (void)
{
+ /* Revert to the previous charlen chain. */
+ 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;
+
gfc_new_block = NULL;
gfc_undo_symbols ();
gfc_clear_warning ();