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

trans-decl.c (get_proc_pointer_decl): Set DECL_TLS_MODEL if threadprivate. 

* trans-decl.c (get_proc_pointer_decl): Set DECL_TLS_MODEL
	if threadprivate.
	* symbol.c (check_conflict): Allow threadprivate attribute with
	FL_PROCEDURE if proc_pointer.

	* testsuite/libgomp.fortran/threadprivate4.f90: New test.

From-SVN: r178114
This commit is contained in:
Jakub Jelinek 2011-08-26 16:55:05 +02:00 committed by Jakub Jelinek
parent 2f27df53e7
commit a6c975bd8e
5 changed files with 96 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View File

@ -1,3 +1,10 @@
2011-08-26 Jakub Jelinek <jakub@redhat.com>
* trans-decl.c (get_proc_pointer_decl): Set DECL_TLS_MODEL
if threadprivate.
* symbol.c (check_conflict): Allow threadprivate attribute with
FL_PROCEDURE if proc_pointer.
2011-08-25 Mikael Morin <mikael.morin@gcc.gnu.org>
PR fortran/50050

3
gcc/fortran/symbol.c
View File

@ -673,7 +673,8 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where)
conf2 (codimension);
conf2 (dimension);
conf2 (function);
conf2 (threadprivate);
if (!attr->proc_pointer)
conf2 (threadprivate);
}
if (!attr->proc_pointer)

5
gcc/fortran/trans-decl.c
View File

@ -1534,6 +1534,11 @@ get_proc_pointer_decl (gfc_symbol *sym)
false, true);
}
/* Handle threadprivate procedure pointers. */
if (sym->attr.threadprivate
&& (TREE_STATIC (decl) || DECL_EXTERNAL (decl)))
DECL_TLS_MODEL (decl) = decl_default_tls_model (decl);
attributes = add_attributes_to_decl (sym->attr, NULL_TREE);
decl_attributes (&decl, attributes, 0);

4
libgomp/ChangeLog
View File

@ -1,3 +1,7 @@
2011-08-26 Jakub Jelinek <jakub@redhat.com>
* testsuite/libgomp.fortran/threadprivate4.f90: New test.
2011-08-19 Jakub Jelinek <jakub@redhat.com>
PR fortran/49792

78
libgomp/testsuite/libgomp.fortran/threadprivate4.f90 Normal file
View File

@ -0,0 +1,78 @@
! { dg-do run }
! { dg-require-effective-target tls_runtime }
module threadprivate4
integer :: vi
procedure(), pointer :: foo
!$omp threadprivate (foo, vi)
contains
subroutine fn0
vi = 0
end subroutine fn0
subroutine fn1
vi = 1
end subroutine fn1
subroutine fn2
vi = 2
end subroutine fn2
subroutine fn3
vi = 3
end subroutine fn3
end module threadprivate4
use omp_lib
use threadprivate4
integer :: i
logical :: l
procedure(), pointer :: bar1
common /thrc/ bar1
!$omp threadprivate (/thrc/)
procedure(), pointer, save :: bar2
!$omp threadprivate (bar2)
l = .false.
call omp_set_dynamic (.false.)
call omp_set_num_threads (4)
!$omp parallel num_threads (4) reduction (.or.:l) private (i)
i = omp_get_thread_num ()
if (i.eq.0) then
foo => fn0
bar1 => fn0
bar2 => fn0
elseif (i.eq.1) then
foo => fn1
bar1 => fn1
bar2 => fn1
elseif (i.eq.2) then
foo => fn2
bar1 => fn2
bar2 => fn2
else
foo => fn3
bar1 => fn3
bar2 => fn3
end if
vi = -1
!$omp barrier
vi = -1
call foo ()
l=l.or.(vi.ne.i)
vi = -2
call bar1 ()
l=l.or.(vi.ne.i)
vi = -3
call bar2 ()
l=l.or.(vi.ne.i)
vi = -1
!$omp end parallel
if (l) call abort
end
! { dg-final { cleanup-modules "threadprivate4" } }