From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jakub@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2153)
 id A22C23858D28; Wed, 15 Dec 2021 09:29:51 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A22C23858D28
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jakub Jelinek <jakub@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-5992] openmp: Avoid calling operand_equal_p on OMP_CLAUSEs
 [PR103704]
X-Act-Checkin: gcc
X-Git-Author: Jakub Jelinek <jakub@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: a5b4ebc217afe6c31334e017d1fead4a6b8e53b2
X-Git-Newrev: c0e34451ae582c901a2df08498b36f68ae401f0a
Message-Id: <20211215092951.A22C23858D28@sourceware.org>
Date: Wed, 15 Dec 2021 09:29:51 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Dec 2021 09:29:51 -0000

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

commit r12-5992-gc0e34451ae582c901a2df08498b36f68ae401f0a
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Wed Dec 15 10:27:08 2021 +0100

    openmp: Avoid calling operand_equal_p on OMP_CLAUSEs [PR103704]
    
    On OMP_CLAUSEs we reuse TREE_TYPE as CP_OMP_CLAUSE_INFO in the C++ FE.
    This confuses the hashing code that operand_equal_p does when checking.
    There is really no reason to compare OMP_CLAUSEs against expressions
    like captured this, they will never compare equal.
    
    2021-12-15  Jakub Jelinek  <jakub@redhat.com>
    
            PR c++/103704
            * semantics.c (finish_omp_target_clauses_r): For OMP_CLAUSEs
            just walk subtrees.
    
            * g++.dg/gomp/pr103704.C: New test.

Diff:
---
 gcc/cp/semantics.c                   |  3 +++
 gcc/testsuite/g++.dg/gomp/pr103704.C | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index d8b20ff5b1b..356fb83200c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -9325,6 +9325,9 @@ finish_omp_target_clauses_r (tree *tp, int *walk_subtrees, void *ptr)
       return NULL_TREE;
     }
 
+  if (TREE_CODE (t) == OMP_CLAUSE)
+    return NULL_TREE;
+
   if (current_object)
     {
       tree this_expr = TREE_OPERAND (current_object, 0);
diff --git a/gcc/testsuite/g++.dg/gomp/pr103704.C b/gcc/testsuite/g++.dg/gomp/pr103704.C
new file mode 100644
index 00000000000..68767c4c055
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr103704.C
@@ -0,0 +1,19 @@
+// PR c++/103704
+// { dg-do compile }
+
+struct S { int a; };
+
+template <typename T>
+struct U : public T {
+  T a;
+  U ()
+  {
+#pragma omp target
+#pragma omp teams
+#pragma omp distribute private(a)
+    for (int k = 0; k < 1; ++k)
+      ;
+  }
+};
+
+struct V : public U<S> { V () : U<S> () {} };