Rather obvious fix and similar to PR106449.
OK for mainline and backporting (how far?). I would like to backport it
at least to GCC 12.
Tobias
-
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634
München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas
Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht
München, HRB 106955
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.
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 000..f263bb42710
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr106492.C
@@ -0,0 +1,49 @@
+/* PR middle-end/106492 */
+
+template
+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 s;
+U u;
+
+
+template
+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 sptr(i);
+Uptr uptr([100]);