Revert "vect: Preserve OMP info for conditional stores [PR118384]"

This reverts commit 8edf8b552313951cb4f2f97821ee4b3820c9506b.

diff --git a/gcc/testsuite/gcc.target/aarch64/pr118384_1.c b/gcc/testsuite/gcc.target/aarch64/pr118384_1.c
deleted file mode 100644 (file)
index 75f6dad..0000000
--- a/gcc/testsuite/gcc.target/aarch64/pr118384_1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* { dg-do run { target aarch64_sve128_hw } } */
-/* { dg-options "-O2 -fopenmp-simd -fno-trapping-math -msve-vector-bits=128 --param aarch64-autovec-preference=sve-only -fstack-protector-strong" } */
-
-#pragma GCC target "+sve"
-
-[[gnu::noipa]] float f(float *ptr, long n)
-{
-  float res = 0.0f;
-#pragma omp simd reduction(+:res)
-  for (long i = 0; i < n; ++i)
-    if (ptr[i] >= 1.0f)
-      res += ptr[i];
-  return res;
-}
-
-[[gnu::noipa]] float g(float *ptr, long n)
-{
-  return f(ptr, n) + 1;
-}
-
-int
-main ()
-{
-#define N 64 * 1024
-  float data[N];
-  for (long i = 0; i < N; ++i)
-    data[i] = 1;
-  if (g(data, N) != N + 1)
-    __builtin_abort();
-  return 0;
-}

diff --git a/gcc/testsuite/gcc.target/aarch64/pr118384_2.c b/gcc/testsuite/gcc.target/aarch64/pr118384_2.c
deleted file mode 100644 (file)
index f45a222..0000000
--- a/gcc/testsuite/gcc.target/aarch64/pr118384_2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target aarch64_sve256_hw } } */
-/* { dg-options "-O2 -fopenmp-simd -fno-trapping-math -msve-vector-bits=256 --param aarch64-autovec-preference=sve-only -fstack-protector-strong" } */
-
-#include "pr118384_1.c"

diff --git a/gcc/tree-vectorizer.cc b/gcc/tree-vectorizer.cc
index f38c8d20a0256f17099c059ec37894b043e199b1..01c647006089a897f8b5f2e2bef50545c4834aa2 100644 (file)
--- a/gcc/tree-vectorizer.cc
+++ b/gcc/tree-vectorizer.cc
@@ -633,8 +633,6 @@ vec_info::move_dr (stmt_vec_info new_stmt_info, stmt_vec_info old_stmt_info)
     = STMT_VINFO_GATHER_SCATTER_P (old_stmt_info);
   STMT_VINFO_STRIDED_P (new_stmt_info)
     = STMT_VINFO_STRIDED_P (old_stmt_info);
-  STMT_VINFO_SIMD_LANE_ACCESS_P (new_stmt_info)
-    = STMT_VINFO_SIMD_LANE_ACCESS_P (old_stmt_info);
 }
 
 /* Permanently remove the statement described by STMT_INFO from the