[gcc(refs/vendors/ARM/heads/arm-perf-staging)] [OpenMP] Fix 'omp exit data' for Fortran arrays (PR 94635)

[Tamar Christina]

https://gcc.gnu.org/g:a7c5803d4e56c6f6c84a9c5b08adffb0cfe1d79f

commit a7c5803d4e56c6f6c84a9c5b08adffb0cfe1d79f
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Tue May 19 10:10:21 2020 +0200

    [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:
---
 gcc/ChangeLog                                       | 10 ++++++++++
 gcc/gimplify.c                                      |  4 +++-
 gcc/testsuite/ChangeLog                             | 10 +++++++++-
 gcc/testsuite/gfortran.dg/gomp/target-exit-data.f90 | 20 ++++++++++++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f51c0fb6b45..9beb81aea1e 100644
--- 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 2f2c51b2d89..0bac9900210 100644
--- 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 d627f6ebda9..4b26ffc6998 100644
--- 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
index 00000000000..ed57d0072d7
--- /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" } }