From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <burnus@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1534)
 id A9F223858C20; Tue,  9 Aug 2022 05:58:50 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A9F223858C20
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Tobias Burnus <burnus@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-1997] OpenMP: Fix folding with simd's linear clause
 [PR106492]
X-Act-Checkin: gcc
X-Git-Author: Tobias Burnus <tobias@codesourcery.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 5f17badb648980275ff4c86b0c207dbd751b00f2
X-Git-Newrev: 8a16b9f983824b6b9a25275cd23b6bba8c98b800
Message-Id: <20220809055850.A9F223858C20@sourceware.org>
Date: Tue,  9 Aug 2022 05:58:50 +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: Tue, 09 Aug 2022 05:58:50 -0000

https://gcc.gnu.org/g:8a16b9f983824b6b9a25275cd23b6bba8c98b800

commit r13-1997-g8a16b9f983824b6b9a25275cd23b6bba8c98b800
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Tue Aug 9 07:57:40 2022 +0200

    OpenMP: Fix folding with simd's linear clause [PR106492]
    
    gcc/ChangeLog:
    
            PR middle-end/106492
            * omp-low.cc (lower_rec_input_clauses): Add missing folding
            to data type of linear-clause list item.
    
    gcc/testsuite/ChangeLog:
    
            PR middle-end/106492
            * g++.dg/gomp/pr106492.C: New test.

Diff:
---
 gcc/omp-low.cc                       |  6 ++---
 gcc/testsuite/g++.dg/gomp/pr106492.C | 49 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc
index d73c165f029..3c4b8593c8b 100644
--- a/gcc/omp-low.cc
+++ b/gcc/omp-low.cc
@@ -6241,10 +6241,10 @@ lower_rec_input_clauses (tree clauses, gimple_seq *ilist, gimple_seq *dlist,
 			}
 
 		      if (POINTER_TYPE_P (TREE_TYPE (x)))
-			x = fold_build2 (POINTER_PLUS_EXPR,
-					 TREE_TYPE (x), x, t);
+			x = fold_build_pointer_plus (x, t);
 		      else
-			x = fold_build2 (PLUS_EXPR, TREE_TYPE (x), x, t);
+			x = fold_build2 (PLUS_EXPR, TREE_TYPE (x), x,
+					 fold_convert (TREE_TYPE (x), t));
 		    }
 
 		  if ((OMP_CLAUSE_CODE (c) != OMP_CLAUSE_LINEAR
diff --git a/gcc/testsuite/g++.dg/gomp/pr106492.C b/gcc/testsuite/g++.dg/gomp/pr106492.C
new file mode 100644
index 00000000000..f263bb42710
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr106492.C
@@ -0,0 +1,49 @@
+/* PR middle-end/106492 */
+
+template <typename T>
+struct S {
+  T a : 12;
+  S () : a(0)
+  {
+#pragma omp for simd linear(a)
+    for (int k = 0; k < 64; ++k)
+      a++;
+  }
+};
+struct U {
+  int a : 12;
+  U () : a(0)
+  {
+#pragma omp for simd linear(a)
+    for (int k = 0; k < 64; ++k)
+      a++;
+  }
+};
+
+S<int> s;
+U u;
+
+
+template <typename T>
+struct Sptr {
+  T a;
+  Sptr (T init) : a(init)
+  {
+#pragma omp for simd linear(a)
+    for (int k = 0; k < 64; ++k)
+      a++;
+  }
+};
+struct Uptr {
+  int *a;
+  Uptr (int *init) : a(init)
+  {
+#pragma omp for simd linear(a)
+    for (int k = 0; k < 64; ++k)
+      a++;
+  }
+};
+
+int i[1024];
+Sptr<int *> sptr(i);
+Uptr uptr(&i[100]);