diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-05-18 21:04:33 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-05-18 21:04:33 +0000 |
| commit | 20898e80960f5d27410c38f75ea5d412a26f753a (patch) | |
| tree | a0b77a2021eecff42ef3625d221bfc8b9e32c3dd /gcc | |
| parent | 703245d706ad3738cf38468067306bb681568053 (diff) | |
| download | gcc-20898e80960f5d27410c38f75ea5d412a26f753a.zip gcc-20898e80960f5d27410c38f75ea5d412a26f753a.tar.gz gcc-20898e80960f5d27410c38f75ea5d412a26f753a.tar.bz2 | |
re PR fortran/66039 (ICE on incomplete parentheses at rewind, flush, endfile, backspace)
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66039
* io.c (match_filepos): Check for incomplete/mangled REWIND, FLUSH,
BACKSPACE, and ENDFILE statements
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66039
* gfortran.dg/filepos1.f90: New test
From-SVN: r223315
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/io.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/filepos1.f90 | 25 |
4 files changed, 37 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6913d88..a5d4d22 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/66039 + * io.c (match_filepos): Check for incomplete/mangled REWIND, FLUSH, + BACKSPACE, and ENDFILE statements + +2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/64925 * symbol.c(check_conflict): Check for a conflict between a dummy argument and an internal procedure name. diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 82a0a87..0ac4f4a 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -2382,9 +2382,7 @@ match_filepos (gfc_statement st, gfc_exec_op op) if (m == MATCH_NO) { m = gfc_match_expr (&fp->unit); - if (m == MATCH_ERROR) - goto done; - if (m == MATCH_NO) + if (m == MATCH_ERROR || m == MATCH_NO) goto syntax; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 593427c..3dd2d94 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/66039 + * gfortran.dg/filepos1.f90: New test + +2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/64925 * gfortran.dg/pr64925.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/filepos1.f90 b/gcc/testsuite/gfortran.dg/filepos1.f90 new file mode 100644 index 0000000..d34902a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/filepos1.f90 @@ -0,0 +1,25 @@ +! { dg-do compile } +! PR fortran/66039 +! +! Original code from Gerhard Steinmetz +! <gerhard dot steinmetz dot fortran at t-online dot de> +subroutine p1 + rewind (( ! { dg-error "Syntax error in REWIND" } + rewind (- ! { dg-error "Syntax error in REWIND" } +end subroutine p1 + +subroutine p2 + flush (( ! { dg-error "Syntax error in FLUSH" } + flush (- ! { dg-error "Syntax error in FLUSH" } +end subroutine p2 + +subroutine p4 + backspace (( ! { dg-error "Syntax error in BACKSPACE" } + backspace (- ! { dg-error "Syntax error in BACKSPACE" } +end subroutine p4 + +subroutine p3 + endfile (( ! { dg-error "Expecting END SUBROUTINE" } + endfile (- ! { dg-error "Expecting END SUBROUTINE" } +end subroutine p3 + |