diff options
| author | Mikael Morin <mikael.morin@sfr.fr> | 2011-08-20 01:20:30 +0200 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2011-08-19 23:20:30 +0000 |
| commit | 176a6603d5acd40bd2eb932d60d20dc8b127b827 (patch) | |
| tree | d1613bb8c8810799b11658e1c9ccdbf600073dc2 /gcc | |
| parent | 3bb19a90c8d642f6659a20cc6d2e51d3de25b0a4 (diff) | |
| download | gcc-176a6603d5acd40bd2eb932d60d20dc8b127b827.zip gcc-176a6603d5acd40bd2eb932d60d20dc8b127b827.tar.gz gcc-176a6603d5acd40bd2eb932d60d20dc8b127b827.tar.bz2 | |
re PR fortran/50129 (ICE on where statement)
2011-08-19 Mikael Morin <mikael.morin@sfr.fr>
PR fortran/50129
* parse.c (parse_where): Undo changes after emitting an error.
2011-08-19 Mikael Morin <mikael.morin@sfr.fr>
PR fortran/50129
* gfortran.dg/where_3.f90: New test.
From-SVN: r177918
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/parse.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/where_3.f90 | 15 |
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6b55546..a361d53 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2011-08-19 Mikael Morin <mikael.morin@sfr.fr> + + PR fortran/50129 + * parse.c (parse_where): Undo changes after emitting an error. + 2011-08-19 Jakub Jelinek <jakub@redhat.com> PR fortran/49792 diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index aab711c..9b11086 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -2778,6 +2778,7 @@ parse_where_block (void) { gfc_error ("ELSEWHERE statement at %C follows previous " "unmasked ELSEWHERE"); + reject_statement (); break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b3ee4b3..7aae8a6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-08-19 Mikael Morin <mikael.morin@sfr.fr> + + PR fortran/50129 + * gfortran.dg/where_3.f90: New test. + 2011-08-19 H.J. Lu <hongjiu.lu@intel.com> PR middle-end/49721 diff --git a/gcc/testsuite/gfortran.dg/where_3.f90 b/gcc/testsuite/gfortran.dg/where_3.f90 new file mode 100644 index 0000000..1507ad9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/where_3.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! +! PR fortran/50129 +! ICE after reporting an error on a masked ELSEWHERE statement following an +! unmasked one. +! +! Contributed by Joost Van de Vondele <Joost.VandeVondele@pci.uzh.ch> + +INTEGER :: I(3) +WHERE (I>2) +ELSEWHERE +ELSEWHERE (I<1) ! { dg-error "follows previous unmasked ELSEWHERE" } +END WHERE +END + |