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

(cherry picked from commit 174e79bf73331b41b7a14dffd45ed8293487f0e0)

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index f08355c05762b31dd460432da80e6696f21011c5..2d3d75aa4796fbdd563e38bfb3bd8925fc625df9 100644 (file)
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,12 @@
+2020-07-14  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline
+       2020-07-14  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR fortran/67311
+       * trans-openmp.c (gfc_has_alloc_comps): Return false also for
+       pointers to arrays.
+
 2020-06-25  Tobias Burnus  <tobias@codesourcery.com>
            Kwok Cheung Yeung  <kcy@codesourery.com>
 

diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index cc88160f2b1b5dc1734f03007646e411f2a4b9c8..26d38561e44bc25f71aa133a612726cf0c58af22 100644 (file)
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -310,6 +310,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/ChangeLog.omp b/libgomp/ChangeLog.omp
index 42e8dc5f91e32b313e0135d43dc396dcfd132e26..c116fcd1f6e5182d911e9e113b8d1fee2718d409 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,11 @@
+2020-07-14  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline
+       2020-07-14  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR fortran/67311
+       * testsuite/libgomp.fortran/target-map-1.f90: New test.
+
 2020-06-18  Andrew Stubbs  <ams@codesourcery.com>
 
        * plugin/plugin-gcn.c (init_environment_variables): Use ".so.1"

diff --git a/libgomp/testsuite/libgomp.fortran/target-map-1.f90 b/libgomp/testsuite/libgomp.fortran/target-map-1.f90
new file mode 100644 (file)
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