re PR fortran/91424 (Extend warnings about DO loops)
2019-08-12 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/91424 * frontend-passes.c (do_subscript): Do not warn for an expression a second time. Do not warn about a zero-trip loop. (doloop_warn): Also look at contained namespaces. 2019-08-12 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/91424 * gfortran.dg/do_subscript_3.f90: New test. * gfortran.dg/do_subscript_4.f90: New test. * gfortran.dg/pr70754.f90: Use indices that to not overflow. 2019-08-12 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/91422 * testsuite/libgomp.oacc-fortran/routine-7.f90: Correct array dimension. From-SVN: r274320
This commit is contained in:
Thomas Koenig
parent
0124d2c5bb
commit
393fdeb1e4
@ -1,3 +1,10 @@
|
||||
2019-08-12 Thomas Koenig <tkoenig@gcc.gnu.org>
|
||||
|
||||
PR fortran/91424
|
||||
* frontend-passes.c (do_subscript): Do not warn for an
|
||||
expression a second time. Do not warn about a zero-trip loop.
|
||||
(doloop_warn): Also look at contained namespaces.
|
||||
|
||||
2019-08-11 Janne Blomqvist <jb@gcc.gnu.org>
|
||||
|
||||
PR fortran/91413
|
||||
|
||||
@ -2556,6 +2556,12 @@ do_subscript (gfc_expr **e)
|
||||
if (in_assoc_list)
|
||||
return 0;
|
||||
|
||||
/* We already warned about this. */
|
||||
if (v->do_not_warn)
|
||||
return 0;
|
||||
|
||||
v->do_not_warn = 1;
|
||||
|
||||
for (ref = v->ref; ref; ref = ref->next)
|
||||
{
|
||||
if (ref->type == REF_ARRAY && ref->u.ar.type == AR_ELEMENT)
|
||||
@ -2608,7 +2614,6 @@ do_subscript (gfc_expr **e)
|
||||
else
|
||||
have_do_start = false;
|
||||
|
||||
|
||||
if (dl->ext.iterator->end->expr_type == EXPR_CONSTANT)
|
||||
{
|
||||
have_do_end = true;
|
||||
@ -2620,6 +2625,17 @@ do_subscript (gfc_expr **e)
|
||||
if (!have_do_start && !have_do_end)
|
||||
return 0;
|
||||
|
||||
/* No warning inside a zero-trip loop. */
|
||||
if (have_do_start && have_do_end)
|
||||
{
|
||||
int sgn, cmp;
|
||||
|
||||
sgn = mpz_cmp_ui (do_step, 0);
|
||||
cmp = mpz_cmp (do_end, do_start);
|
||||
if ((sgn > 0 && cmp < 0) || (sgn < 0 && cmp > 0))
|
||||
break;
|
||||
}
|
||||
|
||||
/* May have to correct the end value if the step does not equal
|
||||
one. */
|
||||
if (have_do_start && have_do_end && mpz_cmp_ui (do_step, 1) != 0)
|
||||
@ -2761,6 +2777,12 @@ static void
|
||||
doloop_warn (gfc_namespace *ns)
|
||||
{
|
||||
gfc_code_walker (&ns->code, doloop_code, do_function, NULL);
|
||||
|
||||
for (ns = ns->contained; ns; ns = ns->sibling)
|
||||
{
|
||||
if (ns->code == NULL || ns->code->op != EXEC_BLOCK)
|
||||
doloop_warn (ns);
|
||||
}
|
||||
}
|
||||
|
||||
/* This selction deals with inlining calls to MATMUL. */
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
2019-08-12 Thomas Koenig <tkoenig@gcc.gnu.org>
|
||||
|
||||
PR fortran/91424
|
||||
* gfortran.dg/do_subscript_3.f90: New test.
|
||||
* gfortran.dg/do_subscript_4.f90: New test.
|
||||
* gfortran.dg/pr70754.f90: Use indices that to not overflow.
|
||||
|
||||
2019-08-12 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR target/83250
|
||||
|
||||
22
gcc/testsuite/gfortran.dg/do_subscript_3.f90
Normal file
22
gcc/testsuite/gfortran.dg/do_subscript_3.f90
Normal file
@ -0,0 +1,22 @@
|
||||
! { dg-do compile }
|
||||
! PR fortran/91424
|
||||
! Check that only one warning is issued inside blocks, and that
|
||||
! warnings are also issued for contained subroutines.
|
||||
|
||||
program main
|
||||
real :: a(5)
|
||||
block
|
||||
integer :: j
|
||||
do j=0, 5 ! { dg-warning "out of bounds" }
|
||||
a(j) = 2. ! { dg-warning "out of bounds" }
|
||||
end do
|
||||
end block
|
||||
call x
|
||||
contains
|
||||
subroutine x
|
||||
integer :: i
|
||||
do i=1,6 ! { dg-warning "out of bounds" }
|
||||
a(i) = 2. ! { dg-warning "out of bounds" }
|
||||
end do
|
||||
end subroutine x
|
||||
end program main
|
||||
11
gcc/testsuite/gfortran.dg/do_subscript_4.f90
Normal file
11
gcc/testsuite/gfortran.dg/do_subscript_4.f90
Normal file
@ -0,0 +1,11 @@
|
||||
! { dg-do compile }
|
||||
! PR 91424 - this used to warn although the DO loop is zero trip.
|
||||
program main
|
||||
implicit none
|
||||
integer :: i
|
||||
real :: a(2)
|
||||
do i=1,3,-1
|
||||
a(i) = 2.
|
||||
end do
|
||||
print *,a
|
||||
end program main
|
||||
@ -18,12 +18,13 @@ contains
|
||||
integer (ii4), dimension(40,40) :: c
|
||||
integer i, j
|
||||
|
||||
do i=1,20
|
||||
b(i,j) = 123 * a(i,j) + 34 * a(i,j+1) &
|
||||
+ 34 * a(i,j-1) + a(i+1,j+1) &
|
||||
+ a(i+1,j-1) + a(i-1,j+1) &
|
||||
+ a(i-1,j-1)
|
||||
c(i,j) = 123
|
||||
j = 10
|
||||
do i=11,30
|
||||
b(i,j) = 123 * a(i,j) + 34 * a(i,j+1) &
|
||||
+ 34 * a(i,j-1) + a(i+1,j+1) &
|
||||
+ a(i+1,j-1) + a(i-1,j+1) &
|
||||
+ a(i-1,j-1)
|
||||
c(i,j) = 123
|
||||
end do
|
||||
|
||||
where ((xyz(:,:,2) /= 0) .and. (c /= 0))
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
2019-08-12 Thomas Koenig <tkoenig@gcc.gnu.org>
|
||||
|
||||
PR fortran/91422
|
||||
* testsuite/libgomp.oacc-fortran/routine-7.f90: Correct array
|
||||
dimension.
|
||||
|
||||
2019-08-08 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* target.c (gomp_map_vars_internal): For GOMP_MAP_USE_DEVICE_PTR
|
||||
@ -32,9 +38,9 @@
|
||||
|
||||
2019-07-23 Steven G. Kargl <kargl@gcc.gnu.org>
|
||||
|
||||
* testsuite/libgomp.fortran/reduction4.f90: Update BOZ usage
|
||||
* testsuite/libgomp.fortran/reduction4.f90: Update BOZ usage.
|
||||
* testsuite/libgomp.fortran/reduction5.f90: Ditto.
|
||||
|
||||
|
||||
2019-07-20 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* testsuite/libgomp.c-c++-common/loop-1.c: New test.
|
||||
|
||||
@ -109,7 +109,7 @@ end subroutine gang
|
||||
|
||||
subroutine seq (a)
|
||||
!$acc routine seq
|
||||
integer, intent (inout) :: a(M)
|
||||
integer, intent (inout) :: a(N)
|
||||
integer :: i
|
||||
|
||||
do i = 1, N
|
||||
|
||||
Loading…
Reference in New Issue
Block a user