From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Sat, 21 Nov 2015 20:06:17 +0000 (+0000)
Subject: simplify.c (gfc_simplify_cshift): Work around bootstrap issues due to inappropriate... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fcae71a3687e8ff73c80293d1121655436f997dc;p=gcc.git

simplify.c (gfc_simplify_cshift): Work around bootstrap issues due to inappropriate warning options.

2015-11-21  Steven G. Kargl  <kargl@gcc.gnu.org>

	* simplify.c (gfc_simplify_cshift): Work around bootstrap issues
	due to inappropriate warning options.

From-SVN: r230710
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1d11ae74ff2..1f1d0477406 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-21  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* simplify.c (gfc_simplify_cshift): Work around bootstrap issues
+	due to inappropriate warning options. 
+
 2015-11-21  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	* simplify.c (gfc_simplify_cshift): Implement simplification of
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 9886d9e20e6..665ea82ee23 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -1869,6 +1869,15 @@ gfc_simplify_cshift (gfc_expr *array, gfc_expr *shift, gfc_expr *dim)
   else
     {
       /* FIXME: Deal with rank > 1 arrays.  For now, don't leak memory.  */
+
+      /* GCC bootstrap is too stupid to realize that the above code for dm
+	 is correct.  First, dim can be specified for a rank 1 array.  It is
+	 not needed in this nor used here.  Second, the code is simply waiting
+	 for someone to implement rank > 1 simplification.   For now, add a
+	 pessimization to the code that has a zero valid reason to be here.  */
+      if (dm > array->rank)
+	gcc_unreachable ();
+
       gfc_free_expr (a);
     }