re PR middle-end/43570 (OpenMP: Invalid read of size 1 (libgomp.fortran/vla6.f90))
PR middle-end/43570 * omp-low.c (scan_sharing_clauses): Don't scan_omp_op OMP_CLAUSE_DECL for OMP_CLAUSE_COPYPRIVATE. (lower_copyprivate_clauses): Use private var in outer context instead of original var. Make sure the types are correct for VLAs. * testsuite/libgomp.fortran/vla8.f90: New test. From-SVN: r158594
This commit is contained in:
Jakub Jelinek
Jakub Jelinek
parent
11152c9536
commit
78db7d92ce
|
|
@ -1,3 +1,12 @@
|
|||
2010-04-21 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR middle-end/43570
|
||||
* omp-low.c (scan_sharing_clauses): Don't scan_omp_op
|
||||
OMP_CLAUSE_DECL for OMP_CLAUSE_COPYPRIVATE.
|
||||
(lower_copyprivate_clauses): Use private var in outer
|
||||
context instead of original var. Make sure the types
|
||||
are correct for VLAs.
|
||||
|
||||
2010-04-21 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
* tree-ssa-structalias.c (do_ds_constraint): Avoid escaping
|
||||
|
|
|
|||
|
|
@ -1433,10 +1433,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx)
|
|||
break;
|
||||
|
||||
case OMP_CLAUSE_COPYPRIVATE:
|
||||
if (ctx->outer)
|
||||
scan_omp_op (&OMP_CLAUSE_DECL (c), ctx->outer);
|
||||
/* FALLTHRU */
|
||||
|
||||
case OMP_CLAUSE_COPYIN:
|
||||
decl = OMP_CLAUSE_DECL (c);
|
||||
by_ref = use_pointer_for_field (decl, NULL);
|
||||
|
|
@ -2702,7 +2698,7 @@ lower_copyprivate_clauses (tree clauses, gimple_seq *slist, gimple_seq *rlist,
|
|||
|
||||
for (c = clauses; c ; c = OMP_CLAUSE_CHAIN (c))
|
||||
{
|
||||
tree var, ref, x;
|
||||
tree var, new_var, ref, x;
|
||||
bool by_ref;
|
||||
location_t clause_loc = OMP_CLAUSE_LOCATION (c);
|
||||
|
||||
|
|
@ -2713,17 +2709,29 @@ lower_copyprivate_clauses (tree clauses, gimple_seq *slist, gimple_seq *rlist,
|
|||
by_ref = use_pointer_for_field (var, NULL);
|
||||
|
||||
ref = build_sender_ref (var, ctx);
|
||||
x = lookup_decl_in_outer_ctx (var, ctx);
|
||||
x = by_ref ? build_fold_addr_expr_loc (clause_loc, x) : x;
|
||||
x = new_var = lookup_decl_in_outer_ctx (var, ctx);
|
||||
if (by_ref)
|
||||
{
|
||||
x = build_fold_addr_expr_loc (clause_loc, new_var);
|
||||
x = fold_convert_loc (clause_loc, TREE_TYPE (ref), x);
|
||||
}
|
||||
gimplify_assign (ref, x, slist);
|
||||
|
||||
ref = build_receiver_ref (var, by_ref, ctx);
|
||||
ref = build_receiver_ref (var, false, ctx);
|
||||
if (by_ref)
|
||||
{
|
||||
ref = fold_convert_loc (clause_loc,
|
||||
build_pointer_type (TREE_TYPE (new_var)),
|
||||
ref);
|
||||
ref = build_fold_indirect_ref_loc (clause_loc, ref);
|
||||
}
|
||||
if (is_reference (var))
|
||||
{
|
||||
ref = fold_convert_loc (clause_loc, TREE_TYPE (new_var), ref);
|
||||
ref = build_fold_indirect_ref_loc (clause_loc, ref);
|
||||
var = build_fold_indirect_ref_loc (clause_loc, var);
|
||||
new_var = build_fold_indirect_ref_loc (clause_loc, new_var);
|
||||
}
|
||||
x = lang_hooks.decls.omp_clause_assign_op (c, var, ref);
|
||||
x = lang_hooks.decls.omp_clause_assign_op (c, new_var, ref);
|
||||
gimplify_and_add (x, rlist);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2010-04-21 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR middle-end/43570
|
||||
* testsuite/libgomp.fortran/vla8.f90: New test.
|
||||
|
||||
2010-04-20 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR libgomp/43706
|
||||
|
|
|
|||
|
|
@ -0,0 +1,254 @@
|
|||
! { dg-do run }
|
||||
|
||||
call test
|
||||
contains
|
||||
subroutine check (x, y, l)
|
||||
integer :: x, y
|
||||
logical :: l
|
||||
l = l .or. x .ne. y
|
||||
end subroutine check
|
||||
|
||||
subroutine foo (c, d, e, f, g, h, i, j, k, n)
|
||||
use omp_lib
|
||||
integer :: n
|
||||
character (len = *) :: c
|
||||
character (len = n) :: d
|
||||
integer, dimension (2, 3:5, n) :: e
|
||||
integer, dimension (2, 3:n, n) :: f
|
||||
character (len = *), dimension (5, 3:n) :: g
|
||||
character (len = n), dimension (5, 3:n) :: h
|
||||
real, dimension (:, :, :) :: i
|
||||
double precision, dimension (3:, 5:, 7:) :: j
|
||||
integer, dimension (:, :, :) :: k
|
||||
logical :: l
|
||||
integer :: p, q, r
|
||||
character (len = n) :: s
|
||||
integer, dimension (2, 3:5, n) :: t
|
||||
integer, dimension (2, 3:n, n) :: u
|
||||
character (len = n), dimension (5, 3:n) :: v
|
||||
character (len = 2 * n + 24) :: w
|
||||
integer :: x, z
|
||||
character (len = 1) :: y
|
||||
l = .false.
|
||||
!$omp parallel default (none) private (c, d, e, f, g, h, i, j, k) &
|
||||
!$omp & private (s, t, u, v) reduction (.or.:l) num_threads (6) &
|
||||
!$omp private (p, q, r, w, x, y) shared (z)
|
||||
x = omp_get_thread_num ()
|
||||
w = ''
|
||||
if (x .eq. 0) w = 'thread0thr_number_0THREAD0THR_NUMBER_0'
|
||||
if (x .eq. 1) w = 'thread1thr_number_1THREAD1THR_NUMBER_1'
|
||||
if (x .eq. 2) w = 'thread2thr_number_2THREAD2THR_NUMBER_2'
|
||||
if (x .eq. 3) w = 'thread3thr_number_3THREAD3THR_NUMBER_3'
|
||||
if (x .eq. 4) w = 'thread4thr_number_4THREAD4THR_NUMBER_4'
|
||||
if (x .eq. 5) w = 'thread5thr_number_5THREAD5THR_NUMBER_5'
|
||||
c = w(8:19)
|
||||
d = w(1:7)
|
||||
forall (p = 1:2, q = 3:5, r = 1:7) e(p, q, r) = 5 * x + p + q + 2 * r
|
||||
forall (p = 1:2, q = 3:7, r = 1:7) f(p, q, r) = 25 * x + p + q + 2 * r
|
||||
forall (p = 1:5, q = 3:7, p + q .le. 8) g(p, q) = w(8:19)
|
||||
forall (p = 1:5, q = 3:7, p + q .gt. 8) g(p, q) = w(27:38)
|
||||
forall (p = 1:5, q = 3:7, p + q .le. 8) h(p, q) = w(1:7)
|
||||
forall (p = 1:5, q = 3:7, p + q .gt. 8) h(p, q) = w(20:26)
|
||||
forall (p = 3:5, q = 2:6, r = 1:7) i(p - 2, q - 1, r) = (7.5 + x) * p * q * r
|
||||
forall (p = 3:5, q = 2:6, r = 1:7) j(p, q + 3, r + 6) = (9.5 + x) * p * q * r
|
||||
forall (p = 1:5, q = 7:7, r = 4:6) k(p, q - 6, r - 3) = 19 + x + p + q + 3 * r
|
||||
s = w(20:26)
|
||||
forall (p = 1:2, q = 3:5, r = 1:7) t(p, q, r) = -10 + x + p - q + 2 * r
|
||||
forall (p = 1:2, q = 3:7, r = 1:7) u(p, q, r) = 30 - x - p + q - 2 * r
|
||||
forall (p = 1:5, q = 3:7, p + q .le. 8) v(p, q) = w(1:7)
|
||||
forall (p = 1:5, q = 3:7, p + q .gt. 8) v(p, q) = w(20:26)
|
||||
!$omp barrier
|
||||
y = ''
|
||||
if (x .eq. 0) y = '0'
|
||||
if (x .eq. 1) y = '1'
|
||||
if (x .eq. 2) y = '2'
|
||||
if (x .eq. 3) y = '3'
|
||||
if (x .eq. 4) y = '4'
|
||||
if (x .eq. 5) y = '5'
|
||||
l = l .or. w(7:7) .ne. y
|
||||
l = l .or. w(19:19) .ne. y
|
||||
l = l .or. w(26:26) .ne. y
|
||||
l = l .or. w(38:38) .ne. y
|
||||
l = l .or. c .ne. w(8:19)
|
||||
l = l .or. d .ne. w(1:7)
|
||||
l = l .or. s .ne. w(20:26)
|
||||
do 103, p = 1, 2
|
||||
do 103, q = 3, 7
|
||||
do 103, r = 1, 7
|
||||
if (q .lt. 6) l = l .or. e(p, q, r) .ne. 5 * x + p + q + 2 * r
|
||||
l = l .or. f(p, q, r) .ne. 25 * x + p + q + 2 * r
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. g(r, q) .ne. w(8:19)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. g(r, q) .ne. w(27:38)
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. h(r, q) .ne. w(1:7)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. h(r, q) .ne. w(20:26)
|
||||
if (q .lt. 6) l = l .or. t(p, q, r) .ne. -10 + x + p - q + 2 * r
|
||||
l = l .or. u(p, q, r) .ne. 30 - x - p + q - 2 * r
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. v(r, q) .ne. w(1:7)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. v(r, q) .ne. w(20:26)
|
||||
103 continue
|
||||
do 104, p = 3, 5
|
||||
do 104, q = 2, 6
|
||||
do 104, r = 1, 7
|
||||
l = l .or. i(p - 2, q - 1, r) .ne. (7.5 + x) * p * q * r
|
||||
l = l .or. j(p, q + 3, r + 6) .ne. (9.5 + x) * p * q * r
|
||||
104 continue
|
||||
do 105, p = 1, 5
|
||||
do 105, q = 4, 6
|
||||
l = l .or. k(p, 1, q - 3) .ne. 19 + x + p + 7 + 3 * q
|
||||
105 continue
|
||||
call check (size (e, 1), 2, l)
|
||||
call check (size (e, 2), 3, l)
|
||||
call check (size (e, 3), 7, l)
|
||||
call check (size (e), 42, l)
|
||||
call check (size (f, 1), 2, l)
|
||||
call check (size (f, 2), 5, l)
|
||||
call check (size (f, 3), 7, l)
|
||||
call check (size (f), 70, l)
|
||||
call check (size (g, 1), 5, l)
|
||||
call check (size (g, 2), 5, l)
|
||||
call check (size (g), 25, l)
|
||||
call check (size (h, 1), 5, l)
|
||||
call check (size (h, 2), 5, l)
|
||||
call check (size (h), 25, l)
|
||||
call check (size (i, 1), 3, l)
|
||||
call check (size (i, 2), 5, l)
|
||||
call check (size (i, 3), 7, l)
|
||||
call check (size (i), 105, l)
|
||||
call check (size (j, 1), 4, l)
|
||||
call check (size (j, 2), 5, l)
|
||||
call check (size (j, 3), 7, l)
|
||||
call check (size (j), 140, l)
|
||||
call check (size (k, 1), 5, l)
|
||||
call check (size (k, 2), 1, l)
|
||||
call check (size (k, 3), 3, l)
|
||||
call check (size (k), 15, l)
|
||||
!$omp single
|
||||
z = omp_get_thread_num ()
|
||||
!$omp end single copyprivate (c, d, e, f, g, h, i, j, k, s, t, u, v)
|
||||
w = ''
|
||||
x = z
|
||||
if (x .eq. 0) w = 'thread0thr_number_0THREAD0THR_NUMBER_0'
|
||||
if (x .eq. 1) w = 'thread1thr_number_1THREAD1THR_NUMBER_1'
|
||||
if (x .eq. 2) w = 'thread2thr_number_2THREAD2THR_NUMBER_2'
|
||||
if (x .eq. 3) w = 'thread3thr_number_3THREAD3THR_NUMBER_3'
|
||||
if (x .eq. 4) w = 'thread4thr_number_4THREAD4THR_NUMBER_4'
|
||||
if (x .eq. 5) w = 'thread5thr_number_5THREAD5THR_NUMBER_5'
|
||||
y = ''
|
||||
if (x .eq. 0) y = '0'
|
||||
if (x .eq. 1) y = '1'
|
||||
if (x .eq. 2) y = '2'
|
||||
if (x .eq. 3) y = '3'
|
||||
if (x .eq. 4) y = '4'
|
||||
if (x .eq. 5) y = '5'
|
||||
l = l .or. w(7:7) .ne. y
|
||||
l = l .or. w(19:19) .ne. y
|
||||
l = l .or. w(26:26) .ne. y
|
||||
l = l .or. w(38:38) .ne. y
|
||||
l = l .or. c .ne. w(8:19)
|
||||
l = l .or. d .ne. w(1:7)
|
||||
l = l .or. s .ne. w(20:26)
|
||||
do 113, p = 1, 2
|
||||
do 113, q = 3, 7
|
||||
do 113, r = 1, 7
|
||||
if (q .lt. 6) l = l .or. e(p, q, r) .ne. 5 * x + p + q + 2 * r
|
||||
l = l .or. f(p, q, r) .ne. 25 * x + p + q + 2 * r
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. g(r, q) .ne. w(8:19)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. g(r, q) .ne. w(27:38)
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. h(r, q) .ne. w(1:7)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. h(r, q) .ne. w(20:26)
|
||||
if (q .lt. 6) l = l .or. t(p, q, r) .ne. -10 + x + p - q + 2 * r
|
||||
l = l .or. u(p, q, r) .ne. 30 - x - p + q - 2 * r
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. v(r, q) .ne. w(1:7)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. v(r, q) .ne. w(20:26)
|
||||
113 continue
|
||||
do 114, p = 3, 5
|
||||
do 114, q = 2, 6
|
||||
do 114, r = 1, 7
|
||||
l = l .or. i(p - 2, q - 1, r) .ne. (7.5 + x) * p * q * r
|
||||
l = l .or. j(p, q + 3, r + 6) .ne. (9.5 + x) * p * q * r
|
||||
114 continue
|
||||
do 115, p = 1, 5
|
||||
do 115, q = 4, 6
|
||||
l = l .or. k(p, 1, q - 3) .ne. 19 + x + p + 7 + 3 * q
|
||||
115 continue
|
||||
x = omp_get_thread_num ()
|
||||
w = ''
|
||||
if (x .eq. 0) w = 'thread0thr_number_0THREAD0THR_NUMBER_0'
|
||||
if (x .eq. 1) w = 'thread1thr_number_1THREAD1THR_NUMBER_1'
|
||||
if (x .eq. 2) w = 'thread2thr_number_2THREAD2THR_NUMBER_2'
|
||||
if (x .eq. 3) w = 'thread3thr_number_3THREAD3THR_NUMBER_3'
|
||||
if (x .eq. 4) w = 'thread4thr_number_4THREAD4THR_NUMBER_4'
|
||||
if (x .eq. 5) w = 'thread5thr_number_5THREAD5THR_NUMBER_5'
|
||||
c = w(8:19)
|
||||
d = w(1:7)
|
||||
forall (p = 1:2, q = 3:5, r = 1:7) e(p, q, r) = 5 * x + p + q + 2 * r
|
||||
forall (p = 1:2, q = 3:7, r = 1:7) f(p, q, r) = 25 * x + p + q + 2 * r
|
||||
forall (p = 1:5, q = 3:7, p + q .le. 8) g(p, q) = w(8:19)
|
||||
forall (p = 1:5, q = 3:7, p + q .gt. 8) g(p, q) = w(27:38)
|
||||
forall (p = 1:5, q = 3:7, p + q .le. 8) h(p, q) = w(1:7)
|
||||
forall (p = 1:5, q = 3:7, p + q .gt. 8) h(p, q) = w(20:26)
|
||||
forall (p = 3:5, q = 2:6, r = 1:7) i(p - 2, q - 1, r) = (7.5 + x) * p * q * r
|
||||
forall (p = 3:5, q = 2:6, r = 1:7) j(p, q + 3, r + 6) = (9.5 + x) * p * q * r
|
||||
forall (p = 1:5, q = 7:7, r = 4:6) k(p, q - 6, r - 3) = 19 + x + p + q + 3 * r
|
||||
s = w(20:26)
|
||||
forall (p = 1:2, q = 3:5, r = 1:7) t(p, q, r) = -10 + x + p - q + 2 * r
|
||||
forall (p = 1:2, q = 3:7, r = 1:7) u(p, q, r) = 30 - x - p + q - 2 * r
|
||||
forall (p = 1:5, q = 3:7, p + q .le. 8) v(p, q) = w(1:7)
|
||||
forall (p = 1:5, q = 3:7, p + q .gt. 8) v(p, q) = w(20:26)
|
||||
!$omp barrier
|
||||
y = ''
|
||||
if (x .eq. 0) y = '0'
|
||||
if (x .eq. 1) y = '1'
|
||||
if (x .eq. 2) y = '2'
|
||||
if (x .eq. 3) y = '3'
|
||||
if (x .eq. 4) y = '4'
|
||||
if (x .eq. 5) y = '5'
|
||||
l = l .or. w(7:7) .ne. y
|
||||
l = l .or. w(19:19) .ne. y
|
||||
l = l .or. w(26:26) .ne. y
|
||||
l = l .or. w(38:38) .ne. y
|
||||
l = l .or. c .ne. w(8:19)
|
||||
l = l .or. d .ne. w(1:7)
|
||||
l = l .or. s .ne. w(20:26)
|
||||
do 123, p = 1, 2
|
||||
do 123, q = 3, 7
|
||||
do 123, r = 1, 7
|
||||
if (q .lt. 6) l = l .or. e(p, q, r) .ne. 5 * x + p + q + 2 * r
|
||||
l = l .or. f(p, q, r) .ne. 25 * x + p + q + 2 * r
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. g(r, q) .ne. w(8:19)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. g(r, q) .ne. w(27:38)
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. h(r, q) .ne. w(1:7)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. h(r, q) .ne. w(20:26)
|
||||
if (q .lt. 6) l = l .or. t(p, q, r) .ne. -10 + x + p - q + 2 * r
|
||||
l = l .or. u(p, q, r) .ne. 30 - x - p + q - 2 * r
|
||||
if (r .lt. 6 .and. q + r .le. 8) l = l .or. v(r, q) .ne. w(1:7)
|
||||
if (r .lt. 6 .and. q + r .gt. 8) l = l .or. v(r, q) .ne. w(20:26)
|
||||
123 continue
|
||||
do 124, p = 3, 5
|
||||
do 124, q = 2, 6
|
||||
do 124, r = 1, 7
|
||||
l = l .or. i(p - 2, q - 1, r) .ne. (7.5 + x) * p * q * r
|
||||
l = l .or. j(p, q + 3, r + 6) .ne. (9.5 + x) * p * q * r
|
||||
124 continue
|
||||
do 125, p = 1, 5
|
||||
do 125, q = 4, 6
|
||||
l = l .or. k(p, 1, q - 3) .ne. 19 + x + p + 7 + 3 * q
|
||||
125 continue
|
||||
!$omp end parallel
|
||||
if (l) call abort
|
||||
end subroutine foo
|
||||
|
||||
subroutine test
|
||||
character (len = 12) :: c
|
||||
character (len = 7) :: d
|
||||
integer, dimension (2, 3:5, 7) :: e
|
||||
integer, dimension (2, 3:7, 7) :: f
|
||||
character (len = 12), dimension (5, 3:7) :: g
|
||||
character (len = 7), dimension (5, 3:7) :: h
|
||||
real, dimension (3:5, 2:6, 1:7) :: i
|
||||
double precision, dimension (3:6, 2:6, 1:7) :: j
|
||||
integer, dimension (1:5, 7:7, 4:6) :: k
|
||||
integer :: p, q, r
|
||||
call foo (c, d, e, f, g, h, i, j, k, 7)
|
||||
end subroutine test
|
||||
end
|
||||
Loading…
Reference in New Issue