From: Steven Bosscher <steven@gcc.gnu.org>
Date: Fri, 22 Aug 2014 18:43:50 +0000 (+0000)
Subject: re PR fortran/62135 (ICE with invalid SELECT CASE selector)
X-Git-Tag: releases/gcc-5.1.0~5231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f172301ff40160dedd796d9846613e2706f7e3ea;p=thirdparty%2Fgcc.git

re PR fortran/62135 (ICE with invalid SELECT CASE selector)

fortran/
	PR fortran/62135
	* resolve.c (resolve_select): Fix list traversal in case the
	last element of the CASE list was dropped as unreachable code.

testsuite/
	PR fortran/62135
	* gfortran.dg/pr62135.f90: New test.

From-SVN: r214351
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1ced6fa187d9..27ef1314b009 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-22  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR fortran/62135
+	* resolve.c (resolve_select): Fix list traversal in case the
+	last element of the CASE list was dropped as unreachable code.
+
 2014-08-22  Joost VandeVondele  <Joost.VandeVondele@mat.ethz.ch>
 
 	PR fortran/61234
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 32ff9dd00945..52aae90ecc46 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -7761,7 +7761,7 @@ resolve_select (gfc_code *code, bool select_type)
 	/* Strip all other unreachable cases.  */
 	if (body->ext.block.case_list)
 	  {
-	    for (cp = body->ext.block.case_list; cp->next; cp = cp->next)
+	    for (cp = body->ext.block.case_list; cp && cp->next; cp = cp->next)
 	      {
 		if (cp->next->unreachable)
 		  {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b47e09044236..a6415d6e4099 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-22  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR fortran/62135
+	* gfortran.dg/pr62135.f90: New test.
+
 2014-08-22  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
 	* g++.dg/warn/wdate-time.C: Remove.
diff --git a/gcc/testsuite/gfortran.dg/pr62135.f90 b/gcc/testsuite/gfortran.dg/pr62135.f90
new file mode 100644
index 000000000000..d5e674b2b814
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr62135.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! { dg-options -Wsurprising }
+
+   PROGRAM PR62135
+      IMPLICIT NONE
+      CHARACTER*1 :: choice
+      choice = 'x'
+      SELECT CASE (choice)
+         ! This triggered an ICE: an unreachable case clause
+         ! as the last of a list.
+         CASE ('2':'7','9':'0') ! { dg-warning "can never be matched" }
+            WRITE(*,*) "barf"
+         CASE DEFAULT
+            CONTINUE
+      END SELECT
+   END PROGRAM PR62135
+