From 96a3b111881df93861a69b98d6fd9ac1b0f94999 Mon Sep 17 00:00:00 2001
From: Chung-Lin Tang <cltang@codesourcery.com>
Date: Fri, 14 Jan 2022 21:58:34 +0800
Subject: [PATCH] openmp: Fix ICE in [PR103705]

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

where multiple ARRAY_REF nodes exist and require more than one peeling
during [c_]finish_omp_clauses.

	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.

(cherry picked from commit cd7484d05cd4b7a9d741fe8bf6c4525406ed7620)
---
 gcc/c/c-typeck.c                           |  3 ++-
 gcc/cp/semantics.c                         |  3 ++-
 gcc/testsuite/c-c++-common/gomp/pr103705.c | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/c-c++-common/gomp/pr103705.c

diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 7d68a28014e4..29f53a926e33 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -14863,7 +14863,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 ed3ecaa2a139..59c052d8eb63 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -7861,7 +7861,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 000000000000..bf4c7066d28b
--- /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;
+}
-- 
2.47.2