[gcc/devel/omp/gcc-12] [og11] Rewrite GOMP_MAP_ATTACH_DETACH mappings unconditionally

[gcc/devel/omp/gcc-12] [og11] Rewrite GOMP_MAP_ATTACH_DETACH mappings unconditionally

[Kwok Yeung]

https://gcc.gnu.org/g:18dc308aeac5efb5d88bde8c0bdf0f92162fdb87

commit 18dc308aeac5efb5d88bde8c0bdf0f92162fdb87
Author: Julian Brown <julian@codesourcery.com>
Date:   Tue May 18 10:10:12 2021 -0700

    [og11] Rewrite GOMP_MAP_ATTACH_DETACH mappings unconditionally
    
    It never makes sense for a GOMP_MAP_ATTACH_DETACH mapping to survive
    beyond gimplify.c, so this patch rewrites such mappings to GOMP_MAP_ATTACH
    or GOMP_MAP_DETACH unconditionally (rather than checking for a list
    of types of OpenACC or OpenMP constructs), in cases where it hasn't
    otherwise been done already in the preceding code.
    
    2021-06-02  Julian Brown  <julian@codesourcery.com>
    
    gcc/
            * gimplify.cc (gimplify_scan_omp_clauses): Simplify condition
            for changing GOMP_MAP_ATTACH_DETACH to GOMP_MAP_ATTACH or
            GOMP_MAP_DETACH.

Diff:
---
 gcc/ChangeLog.omp |  6 ++++++
 gcc/gimplify.cc   | 10 +---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index f031f35d57e..bfc3bfa18ef 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,9 @@
+2021-06-02  Julian Brown  <julian@codesourcery.com>
+
+	* gimplify.cc (gimplify_scan_omp_clauses): Simplify condition
+	for changing GOMP_MAP_ATTACH_DETACH to GOMP_MAP_ATTACH or
+	GOMP_MAP_DETACH.
+
 2021-04-07  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
 	* omp-low.cc (is_oacc_parallel_or_serial): Handle
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index 9248ca56b16..4eca97d2903 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -10180,15 +10180,7 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
 		skip_map_struct:
 		  ;
 		}
-	      else if ((code == OACC_ENTER_DATA
-			|| code == OACC_EXIT_DATA
-			|| code == OACC_DATA
-			|| code == OACC_PARALLEL
-			|| code == OACC_KERNELS
-			|| code == OACC_SERIAL
-			|| code == OMP_TARGET_ENTER_DATA
-			|| code == OMP_TARGET_EXIT_DATA)
-		       && OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ATTACH_DETACH)
+	      else if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ATTACH_DETACH)
 		{
 		  gomp_map_kind k = ((code == OACC_EXIT_DATA
 				      || code == OMP_TARGET_EXIT_DATA)