From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Fri, 21 Oct 2011 22:48:39 +0000 (+0000)
Subject: re PR fortran/50821 (3 new GCC HEAD@180266 regressions)
X-Git-Tag: releases/gcc-4.7.0~2905
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d8c9e5c9a37743e22836e9621fb5f865b97a3e3;p=thirdparty%2Fgcc.git

re PR fortran/50821 (3 new GCC HEAD@180266 regressions)

2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/50821
	* check.c (gfc_check_ishftc): Check args are constant before
	extracting the integer.

From-SVN: r180316
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e58dd112aedc..251bd45fd260 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/50821
+	* check.c (gfc_check_ishftc): Check args are constant before 
+	extracting the integer.
+
 2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/50514
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 9aaad01ca361..34b3a68057ca 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -1967,22 +1967,29 @@ gfc_check_ishftc (gfc_expr *i, gfc_expr *shift, gfc_expr *size)
       if (less_than_bitsize1 ("I", i, "SIZE", size, true) == FAILURE)
 	return FAILURE;
 
-      gfc_extract_int (size, &i3);
-      if (i3 <= 0)
+      if (size->expr_type == EXPR_CONSTANT)
 	{
-	  gfc_error ("SIZE at %L must be positive", &size->where);
-	  return FAILURE;
-	}
+	  gfc_extract_int (size, &i3);
+	  if (i3 <= 0)
+	    {
+	      gfc_error ("SIZE at %L must be positive", &size->where);
+	      return FAILURE;
+	    }
 
-      gfc_extract_int (shift, &i2);
-      if (i2 < 0)
-	i2 = -i2;
+	  if (shift->expr_type == EXPR_CONSTANT)
+	    {
+	      gfc_extract_int (shift, &i2);
+	      if (i2 < 0)
+		i2 = -i2;
 
-      if (i2 > i3)
-	{
-	  gfc_error ("The absolute value of SHIFT at %L must be less than "
-		     "or equal to SIZE at %L", &shift->where, &size->where);
-	  return FAILURE;
+	      if (i2 > i3)
+		{
+		  gfc_error ("The absolute value of SHIFT at %L must be less "
+			     "than or equal to SIZE at %L", &shift->where,
+			     &size->where);
+		  return FAILURE;
+		}
+	     }
 	}
     }
   else if (less_than_bitsize1 ("I", i, NULL, shift, true) == FAILURE)