Re: [PATCH, OpenMP, C/C++] Fix PR103705

[Chung-Lin Tang]

Forgot to attach the patch, here it is :P

On 2022/1/10 10:59 PM, Chung-Lin Tang wrote:

For cases like:
   #pragma omp target update from(s[0].a[0:1])

The handling in [c_]finish_omp_clauses was only peeling off ARRAY_REF once
before the loop handling COMPONENT_REF, and snagged when the base of the
component_ref is an array access. This adds the handling there for both C
and C++ front-ends.

(ICE started to happen after 
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=6c0399378e77d029
where map/from/to clause syntax was relaxed to allow more stuff)

Tested without regressions, okay to commit?

Thanks,
Chung-Lin

         PR c++/103705

gcc/c/ChangeLog:

         * c-typeck.c (c_finish_omp_clauses): Also continue peeling off of
         outer node for ARRAY_REFs.

gcc/cp/ChangeLog:

         * semantics.c (finish_omp_clauses): Also continue peeling off of
         outer node for ARRAY_REFs.

gcc/testsuite/ChangeLog:

     * c-c++-common/gomp/pr103705.c: New test.

diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 8b492cf5bed..ac6618eca5c 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -14929,7 +14929,8 @@ c_finish_omp_clauses (tree clauses, enum 
c_omp_region_type ort)
                                t = TREE_OPERAND (t, 0);
                            }
                        }
-                     while (TREE_CODE (t) == COMPONENT_REF);
+                     while (TREE_CODE (t) == COMPONENT_REF
+                            || TREE_CODE (t) == ARRAY_REF);
 
                      if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_MAP
                          && OMP_CLAUSE_MAP_IMPLICIT (c)
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 645654768e3..a7435ed1266 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -7931,7 +7931,8 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type 
ort)
                                t = TREE_OPERAND (t, 0);
                            }
                        }
-                     while (TREE_CODE (t) == COMPONENT_REF);
+                     while (TREE_CODE (t) == COMPONENT_REF
+                            || TREE_CODE (t) == ARRAY_REF);
 
                      if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_MAP
                          && OMP_CLAUSE_MAP_IMPLICIT (c)
diff --git a/gcc/testsuite/c-c++-common/gomp/pr103705.c 
b/gcc/testsuite/c-c++-common/gomp/pr103705.c
new file mode 100644
index 00000000000..bf4c7066d28
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/pr103705.c
@@ -0,0 +1,14 @@
+/* PR c++/103705 */
+/* { dg-do compile } */
+
+struct S
+{
+  int a[2];
+};
+
+int main (void)
+{
+  struct S s[1];
+  #pragma omp target update from(s[0].a[0:1])
+  return 0;
+}