diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2020-07-14 12:55:53 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2020-07-14 12:55:53 +0200 |
| commit | 174e79bf73331b41b7a14dffd45ed8293487f0e0 (patch) | |
| tree | f07e667a6df8fd524a8a44089519d655faacf644 | |
| parent | f418bd4b92a03ee0ec0fe4cfcd896e86e11ac2cf (diff) | |
| download | gcc-174e79bf73331b41b7a14dffd45ed8293487f0e0.zip gcc-174e79bf73331b41b7a14dffd45ed8293487f0e0.tar.gz gcc-174e79bf73331b41b7a14dffd45ed8293487f0e0.tar.bz2 | |
[Fortran, OpenMP] Fix allocatable-components check (PR67311)
gcc/fortran/ChangeLog:
PR fortran/67311
* trans-openmp.c (gfc_has_alloc_comps): Return false also for
pointers to arrays.
libgomp/ChangeLog:
PR fortran/67311
* testsuite/libgomp.fortran/target-map-1.f90: New test.
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/target-map-1.f90 | 41 |
2 files changed, 46 insertions, 0 deletions
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 38e141d..b2645e7 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -330,6 +330,11 @@ gfc_has_alloc_comps (tree type, tree decl) return false; } + if (GFC_DESCRIPTOR_TYPE_P (type) + && (GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_POINTER + || GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_POINTER_CONT)) + return false; + if (GFC_DESCRIPTOR_TYPE_P (type) || GFC_ARRAY_TYPE_P (type)) type = gfc_get_element_type (type); diff --git a/libgomp/testsuite/libgomp.fortran/target-map-1.f90 b/libgomp/testsuite/libgomp.fortran/target-map-1.f90 new file mode 100644 index 0000000..6107530 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/target-map-1.f90 @@ -0,0 +1,41 @@ +! PR fortran/67311 + +implicit none + TYPE myType + integer :: A + TYPE(myType), DIMENSION(:), POINTER :: x + TYPE(myType), DIMENSION(:), contiguous, POINTER :: y + integer :: B + END TYPE myType + call openmp_sub +contains + subroutine openmp_sub + type(myType) :: argument + + !$OMP PARALLEL DEFAULT(NONE) PRIVATE(argument) + argument%a = 5 + argument%b = 7 + call foo(argument) + if (.not.associated(argument%x) .or. size(argument%x) /= 2) stop 2 + if (argument%a /= 8 .or. argument%b /= 9 & + .or. any(argument%x(:)%a /= [2, 3]) & + .or. any(argument%x(:)%b /= [9, 1])) stop 3 + if (.not.associated(argument%y) .or. size(argument%y) /= 3) stop 4 + if (any(argument%y(:)%a /= [11, 22, 33]) & + .or. any(argument%y(:)%b /= [44, 55, 66])) stop 5 + deallocate (argument%x, argument%y) + !$OMP END PARALLEL + end subroutine openmp_sub + subroutine foo(x) + type(myType), intent(inout) :: x + !$omp declare target + if (x%a /= 5 .or. x%b /= 7) stop 1 + x%a = 8; x%b = 9 + allocate (x%x(2)) + x%x(:)%a = [2, 3] + x%x(:)%b = [9, 1] + allocate (x%y(3)) + x%y(:)%a = [11, 22, 33] + x%y(:)%b = [44, 55, 66] + end subroutine +end |