[gcc/devel/omp/gcc-13] Fix ICE in libgomp.oacc-c-c++-common/noncontig_array-* tests

[gcc/devel/omp/gcc-13] Fix ICE in libgomp.oacc-c-c++-common/noncontig_array-* tests

[Kwok Yeung]

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

commit fbb0062ece786cb643b8262fe6658fc6e9fe8ce5
Author: Kwok Cheung Yeung <kcy@codesourcery.com>
Date:   Tue Apr 18 16:56:53 2023 +0100

    Fix ICE in libgomp.oacc-c-c++-common/noncontig_array-* tests
    
    The GOMP_MAP_NONCONTIG_ARRAY_* map types need to be handled in omp_group_base
    (which was added in GCC 13).
    
    This should probably be a fixup to 'Merge non-contiguous array support
    patches'.
    
    2023-04-18  Kwok Cheung Yeung  <kcy@codesourcery.com>
    
            * gimplify.cc (omp_group_base): Handle GOMP_MAP_NONCONTIG_ARRAY_*
            map types.

Diff:
---
 gcc/ChangeLog.omp | 5 +++++
 gcc/gimplify.cc   | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 2b86c514d59..1f46237398e 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,8 @@
+2023-04-18  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+	* gimplify.cc (omp_group_base): Handle GOMP_MAP_NONCONTIG_ARRAY_*
+	map types.
+
 2023-04-17  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
 	* gimplify.cc (omp_group_base): Handle GOMP_MAP_DECLARE_ALLOCATE
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index ce333414ea0..542915304dd 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -9360,6 +9360,14 @@ omp_group_base (omp_mapping_group *grp, unsigned int *chained,
     case GOMP_MAP_ALWAYS_PRESENT_FROM:
     case GOMP_MAP_ALWAYS_PRESENT_TO:
     case GOMP_MAP_ALWAYS_PRESENT_TOFROM:
+    case GOMP_MAP_NONCONTIG_ARRAY_ALLOC:
+    case GOMP_MAP_NONCONTIG_ARRAY_FROM:
+    case GOMP_MAP_NONCONTIG_ARRAY_TO:
+    case GOMP_MAP_NONCONTIG_ARRAY_TOFROM:
+    case GOMP_MAP_NONCONTIG_ARRAY_FORCE_ALLOC:
+    case GOMP_MAP_NONCONTIG_ARRAY_FORCE_FROM:
+    case GOMP_MAP_NONCONTIG_ARRAY_FORCE_TO:
+    case GOMP_MAP_NONCONTIG_ARRAY_FORCE_TOFROM:
     case GOMP_MAP_ALLOC:
     case GOMP_MAP_RELEASE:
     case GOMP_MAP_DELETE: