backport: re PR fortran/66461 (ICE on missing end program in fixed source)

2016-05-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	Backport from trunk.
	PR fortran/66461
	* scanner.c (gfc_next_char_literal): Clear end_flag when adjusting
	current locus back to old_locus.

	Backport from trunk.
	PR fortran/66461
	* gfortran.dg/unexpected_eof.f: New test

From-SVN: r236808

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4e2610a161e0fb930be37c83a306bc503ff219f5..59409e16975f30ab8e171c8dceac1fde873ffdde 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2016-05-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       Backport from trunk.
+       PR fortran/66461
+       * scanner.c (gfc_next_char_literal): Clear end_flag when adjusting
+       current locus back to old_locus.
+
 2016-02-28  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        Backported from mainline

diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index aa4d7564706ed711b67b842028cca3e2ff57fb69..1a6f4612b7cb323bf856eb57aba92d793cc6bcee 100644 (file)
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -1259,6 +1259,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 bc1044a415d4fca46554807c22a420906c1e601d..f896f6bf3fa92fcfad0b47f04e8863d990014b5d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       Backport from trunk.
+       PR fortran/66461
+       * gfortran.dg/unexpected_eof.f: New test
+
 2016-05-22  Iain Sandoe  <iain@codesourcery.com>
            Dominique d'Humieres  <dominiq@lps.ens.fr>
 

diff --git a/gcc/testsuite/gfortran.dg/unexpected_eof.f b/gcc/testsuite/gfortran.dg/unexpected_eof.f
new file mode 100644 (file)
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 }