diff options
author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-05-24 04:15:39 +0000 |
---|---|---|
committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2016-05-24 04:15:39 +0000 |
commit | 85d5c27d78e0698914c3442acf7273c4ea4b1863 (patch) | |
tree | 972293b874818f1d6e765c7fa5161ace1d3110df /gcc | |
parent | 4ddcdbf91224dc630c820a47a7bc7433f4fa6925 (diff) | |
download | gcc-85d5c27d78e0698914c3442acf7273c4ea4b1863.zip gcc-85d5c27d78e0698914c3442acf7273c4ea4b1863.tar.gz gcc-85d5c27d78e0698914c3442acf7273c4ea4b1863.tar.bz2 |
re PR fortran/66461 (ICE on missing end program in fixed source)
2016-05-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/66461
* scanner.c (gfc_next_char_literal): Clear end_flag when adjusting
current locus back to old_locus.
* gfortran.dg/unexpected_eof.f: New test
From-SVN: r236627
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/fortran/scanner.c | 1 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/unexpected_eof.f | 8 |
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d32c7d5..8db7017 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2016-05-23 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/66461 + * scanner.c (gfc_next_char_literal): Clear end_flag when adjusting + current locus back to old_locus. + 2016-05-20 Jakub Jelinek <jakub@redhat.com> PR fortran/71204 diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index f4dedd6..6a7a5b6 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -1556,6 +1556,7 @@ restart: not_continuation: c = '\n'; gfc_current_locus = old_loc; + end_flag = 0; done: if (c == '\n') diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ed80db5..4978998 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-05-23 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/66461 + * gfortran.dg/unexpected_eof.f: New test + 2016-05-23 Michael Meissner <meissner@linux.vnet.ibm.com> Kelvin Nilsen <kelvin@gcc.gnu.org> diff --git a/gcc/testsuite/gfortran.dg/unexpected_eof.f b/gcc/testsuite/gfortran.dg/unexpected_eof.f new file mode 100644 index 0000000..d3cdb99 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/unexpected_eof.f @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR66461 ICE on missing end program in fixed source + program p + integer x(2) + x = -1 + if ( x(1) < 0 .or. + & x(2) < 0 ) print *, x +! { dg-error "Unexpected end of file" "" { target *-*-* } 0 } |