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

	* gfortran.dg/ishft_3.f90:  Update test.

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

	* check.c (less_than_bitsize1): Check |shift| <= bit_size(i).
	(gfc_check_ishftc):  Check |shift| <= bit_size(i) and check
	that size is positive.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180264 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4f02462..e58dd11 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,9 +1,16 @@
-2011-10-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/50514
+       * check.c (less_than_bitsize1): Check |shift| <= bit_size(i).
+       (gfc_check_ishftc):  Check |shift| <= bit_size(i) and check
+       that size is positive.
+
+2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/50524
        * resolve.c (resolve_ref): Check return value of resolve_substring().
 
-2011-10-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        * io.c (match_dt_format): Match a user-defined operator or a kind
        type prefixed string.

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index bf45592..9aaad01 100644 (file)
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -286,6 +286,22 @@ less_than_bitsize1 (const char *arg1, gfc_expr *expr1, const char *arg2,
     {
       gfc_extract_int (expr2, &i2);
       i3 = gfc_validate_kind (BT_INTEGER, expr1->ts.kind, false);
+ 
+      /* For ISHFT[C], check that |shift| <= bit_size(i).  */
+      if (arg2 == NULL)
+       {
+         if (i2 < 0)
+           i2 = -i2;
+
+         if (i2 > gfc_integer_kinds[i3].bit_size)
+           {
+             gfc_error ("The absolute value of SHIFT at %L must be less "
+                        "than or equal to BIT_SIZE('%s')",
+                        &expr2->where, arg1);
+             return FAILURE;
+           }
+       }
+
       if (or_equal)
        {
          if (i2 > gfc_integer_kinds[i3].bit_size)
@@ -1927,6 +1943,9 @@ gfc_check_ishft (gfc_expr *i, gfc_expr *shift)
       || type_check (shift, 1, BT_INTEGER) == FAILURE)
     return FAILURE;
 
+  if (less_than_bitsize1 ("I", i, NULL, shift, true) == FAILURE)
+    return FAILURE;
+
   return SUCCESS;
 }
 
@@ -1938,7 +1957,35 @@ gfc_check_ishftc (gfc_expr *i, gfc_expr *shift, gfc_expr *size)
       || type_check (shift, 1, BT_INTEGER) == FAILURE)
     return FAILURE;
 
-  if (size != NULL && type_check (size, 2, BT_INTEGER) == FAILURE)
+  if (size != NULL) 
+    {
+      int i2, i3;
+
+      if (type_check (size, 2, BT_INTEGER) == FAILURE)
+       return FAILURE;
+
+      if (less_than_bitsize1 ("I", i, "SIZE", size, true) == FAILURE)
+       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 (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)
     return FAILURE;
 
   return SUCCESS;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5da63c4..e5db96a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+       PR fortran/50514
+       * gfortran.dg/ishft_3.f90:  Update test.
+
+2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
        PR fortran/50524
        * gfortran.dg/substring_integer_index.f90: New test.
 

diff --git a/gcc/testsuite/gfortran.dg/ishft_3.f90 b/gcc/testsuite/gfortran.dg/ishft_3.f90
index fa3938e..626e71c 100644 (file)
--- a/gcc/testsuite/gfortran.dg/ishft_3.f90
+++ b/gcc/testsuite/gfortran.dg/ishft_3.f90
@@ -1,11 +1,38 @@
 ! { dg-do compile }
+! PR fortran/50514
 program ishft_3
-  integer i, j
-  write(*,*) ishftc( 3, 2, 3 )
-  write(*,*) ishftc( 3, 2, i )
-  write(*,*) ishftc( 3, i, j )
-  write(*,*) ishftc( 3, 128 )     ! { dg-error "exceeds BIT_SIZE of first" }
-  write(*,*) ishftc( 3, 0, 128 )  ! { dg-error "exceeds BIT_SIZE of first" }
-  write(*,*) ishftc( 3, 0, 0 )    ! { dg-error "Invalid third argument" }
-  write(*,*) ishftc( 3, 3, 2 )    ! { dg-error "exceeds third argument" }
+
+   implicit none
+
+   integer j, m
+
+   m = 42
+   !
+   ! These should compile.
+   !
+   j = ishft(m, 16)
+   j = ishft(m, -16)
+   j = ishftc(m, 16)
+   j = ishftc(m, -16)
+   !
+   ! These should issue an error.
+   !
+   j = ishft(m, 640)    ! { dg-error "absolute value of SHIFT" }
+   j = ishftc(m, 640)   ! { dg-error "absolute value of SHIFT" }
+   j = ishft(m, -640)   ! { dg-error "absolute value of SHIFT" }
+   j = ishftc(m, -640)  ! { dg-error "absolute value of SHIFT" }
+
+   ! abs(SHIFT) must be <= SIZE
+
+   j = ishftc(m,  1, 2)
+   j = ishftc(m,  1, 2)
+   j = ishftc(m, -1, 2)
+   j = ishftc(m, -1, 2)
+
+   j = ishftc(m,  10, 2)! { dg-error "absolute value of SHIFT" }
+   j = ishftc(m,  10, 2)! { dg-error "absolute value of SHIFT" }
+   j = ishftc(m, -10, 2)! { dg-error "absolute value of SHIFT" }
+   j = ishftc(m, -10, 2)! { dg-error "absolute value of SHIFT" }
+
+   j = ishftc(m, 1, -2) ! { dg-error "must be positive" }
 end program