aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/parse.c
diff options
context:
space:
mode:
authorSteven Bosscher <steven@gcc.gnu.org>2014-12-15 18:37:59 +0000
committerJakub Jelinek <jakub@gcc.gnu.org>2014-12-15 19:37:59 +0100
commitd5e2274d7996cf8272a6c23152b347e8692d61f3 (patch)
tree459a209d2169e7738ed70e98e823893506c1f517 /gcc/fortran/parse.c
parent76be46db72595b894a6e6da15e892d4a1f8f91cf (diff)
downloadgcc-d5e2274d7996cf8272a6c23152b347e8692d61f3.zip
gcc-d5e2274d7996cf8272a6c23152b347e8692d61f3.tar.gz
gcc-d5e2274d7996cf8272a6c23152b347e8692d61f3.tar.bz2
re PR fortran/61669 (Error recovery ICE)
PR fortran/61669 * gfortran.h (struct gfc_namespace): Add OLD_DATA field. * decl.c (gfc_reject_data): New function. * parse.c *use_modules): Record roll-back point. (next_statement): Likewise. (reject_statement): Roll back to last accepted DATA. * gfortran.dg/pr61669.f90: New test. Co-Authored-By: Jakub Jelinek <jakub@redhat.com> From-SVN: r218757
Diffstat (limited to 'gcc/fortran/parse.c')
-rw-r--r--gcc/fortran/parse.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index ad3137b..54c0cdc 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -119,6 +119,7 @@ use_modules (void)
gfc_warning_check ();
gfc_current_ns->old_cl_list = gfc_current_ns->cl_list;
gfc_current_ns->old_equiv = gfc_current_ns->equiv;
+ gfc_current_ns->old_data = gfc_current_ns->data;
last_was_use_stmt = false;
}
@@ -1098,6 +1099,7 @@ next_statement (void)
gfc_current_ns->old_cl_list = gfc_current_ns->cl_list;
gfc_current_ns->old_equiv = gfc_current_ns->equiv;
+ gfc_current_ns->old_data = gfc_current_ns->data;
for (;;)
{
gfc_statement_label = NULL;
@@ -2043,6 +2045,8 @@ reject_statement (void)
gfc_free_equiv_until (gfc_current_ns->equiv, gfc_current_ns->old_equiv);
gfc_current_ns->equiv = gfc_current_ns->old_equiv;
+ gfc_reject_data (gfc_current_ns);
+
gfc_new_block = NULL;
gfc_undo_symbols ();
gfc_clear_warning ();