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

gcc/fortran/ChangeLog

+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

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;
 	    }
 

gcc/testsuite/ChangeLog

+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

gcc/testsuite/gfortran.dg/where_3.f90

+! { 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
+