OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ishft_3.f90: Update test. 

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.

From-SVN: r180264
This commit is contained in:
Steven G. Kargl 2011-10-20 18:07:10 +00:00
parent 86daf6d59d
commit 0019028b0b
4 changed files with 97 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/fortran/ChangeLog
View File

@ -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.

49
gcc/fortran/check.c
View File

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

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
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

43
gcc/testsuite/gfortran.dg/ishft_3.f90
View File

@ -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