[OpenMP] Fix 'omp exit data' for Fortran arrays (PR 94635)

        Backport from mainline
        2020-05-15  Tobias Burnus  <tobias@codesourcery.com>

gcc/
	PR middle-end/94635
	* gimplify.c (gimplify_scan_omp_clauses): For MAP_TO_PSET with
	OMP_TARGET_EXIT_DATA, use 'release:' unless the associated
	item is 'delete:'.

gcc/testsuite
	PR middle-end/94635
	* gfortran.dg/gomp/target-exit-data.f90: New.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f51c0fb6b45d923baf00d38b8309f05627d147db..9beb81aea1ea58d13763df60f1f31bf562d04679 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2020-05-19  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline
+       2020-05-15  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR middle-end/94635
+       * gimplify.c (gimplify_scan_omp_clauses): For MAP_TO_PSET with
+       OMP_TARGET_EXIT_DATA, use 'release:' unless the associated
+       item is 'delete:'.
+
 2020-05-18  Martin Sebor  <msebor@redhat.com>
 
        PR middle-end/94940

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 2f2c51b2d894e8070e4e62e014acf438e4be12cb..0bac990021023317fb9586e1d9682f594f6bfbbf 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -8789,7 +8789,9 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
             to be delete; hence, we turn the MAP_TO_PSET into a MAP_DELETE.  */
          if (code == OMP_TARGET_EXIT_DATA
              && OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_TO_PSET)
-           OMP_CLAUSE_SET_MAP_KIND (c, GOMP_MAP_DELETE);
+           OMP_CLAUSE_SET_MAP_KIND (c, OMP_CLAUSE_MAP_KIND (*prev_list_p)
+                                       == GOMP_MAP_DELETE
+                                       ? GOMP_MAP_DELETE : GOMP_MAP_RELEASE);
          else if ((code == OMP_TARGET_EXIT_DATA || code == OMP_TARGET_UPDATE)
                   && (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_POINTER
                       || OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_TO_PSET))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d627f6ebda973477a0adfdd218e4386e459c7f19..4b26ffc6998ae8a2184438a7579786fd67fe0835 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-19  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline
+       2020-05-15  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR middle-end/94635
+       * gfortran.dg/gomp/target-exit-data.f90: New.
+
 2020-05-18  Martin Sebor  <msebor@redhat.com>
 
        PR middle-end/94940
@@ -18,7 +26,7 @@
 2020-05-13  Mark Eggleston  <markeggleston@gcc.gnu.org>
 
        Backport from master
-        2020-05-13  Mark Eggleston  <markeggleston@gcc.gnu.org>
+       2020-05-13  Mark Eggleston  <markeggleston@gcc.gnu.org>
 
        PR fortran/93497
        * gfortran.dg/pr88025.f90: Change in wording of error.

diff --git a/gcc/testsuite/gfortran.dg/gomp/target-exit-data.f90 b/gcc/testsuite/gfortran.dg/gomp/target-exit-data.f90
new file mode 100644 (file)
index 0000000..ed57d00
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/target-exit-data.f90
@@ -0,0 +1,20 @@
+! { dg-do compile }
+! { dg-additional-options "-fdump-tree-omplower" }
+!
+! PR middle-end/94635
+
+integer, allocatable :: one(:), two(:), three(:)
+
+!$omp target enter data map(alloc:one)
+!$omp target enter data map(alloc:two)
+!$omp target enter data map(to:three)
+
+! ...
+!$omp target exit data map(delete:one)
+!$omp target exit data map(release:two)
+!$omp target exit data map(from:three)
+end
+
+! { dg-final { scan-tree-dump "omp target exit data map\\(delete:.*\\) map\\(delete:one \\\[len: .*\\\]\\)" "omplower" } }
+! { dg-final { scan-tree-dump "omp target exit data map\\(release:.*\\) map\\(release:two \\\[len: .*\\\]\\)" "omplower" } }
+! { dg-final { scan-tree-dump "omp target exit data map\\(from:.*\\) map\\(release:three \\\[len: .*\\\]\\)" "omplower" } }