[SYCL] Promote breaking changes for logical operations (#20816)

Author: againull

sycl/include/sycl/functional.hpp

@@ -20,28 +20,9 @@ template <typename T = void> using multiplies = std::multiplies<T>;
 template <typename T = void> using bit_and = std::bit_and<T>;
 template <typename T = void> using bit_or = std::bit_or<T>;
 template <typename T = void> using bit_xor = std::bit_xor<T>;
-
-// std:logical_and/std::logical_or with a non-void type returns bool,
-// sycl requires returning T.
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
 template <typename T = void> struct logical_and : std::logical_and<T> {};
 template <typename T = void> struct logical_or : std::logical_or<T> {};
 
-#else
-template <typename T = void> struct logical_and {
-  T operator()(const T &lhs, const T &rhs) const { return lhs && rhs; }
-};
-
-template <> struct logical_and<void> : std::logical_and<void> {};
-
-template <typename T = void> struct logical_or {
-  T operator()(const T &lhs, const T &rhs) const { return lhs || rhs; }
-};
-
-template <> struct logical_or<void> : std::logical_or<void> {};
-
-#endif
-
 // sycl::minimum definition should be consistent with std::min
 template <typename T = void> struct minimum {
   T operator()(const T &lhs, const T &rhs) const {

sycl/test/basic_tests/logical_operations.cpp

@@ -1,4 +1,3 @@
-// RUN: %clang -fpreview-breaking-changes -fsycl -fsyntax-only %s
 // RUN: %clang -fsycl -fsyntax-only %s
 
 #include <cassert>
@@ -10,16 +9,9 @@ int main() {
   const auto logicalOr = sycl::logical_or<int>();
   const auto logicalAndVoid = sycl::logical_and<void>();
   const auto logicalOrVoid = sycl::logical_or<void>();
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
   static_assert(std::is_same_v<decltype(logicalAnd(1, 2)), bool>);
   static_assert(std::is_same_v<decltype(logicalOr(1, 2)), bool>);
   static_assert(std::is_same_v<decltype(logicalAndVoid(1, 2)), bool>);
   static_assert(std::is_same_v<decltype(logicalOrVoid(1, 2)), bool>);
-#else
-  static_assert(std::is_same_v<decltype(logicalAnd(1, 2)), int>);
-  static_assert(std::is_same_v<decltype(logicalOr(1, 2)), int>);
-  static_assert(std::is_same_v<decltype(logicalAndVoid(1, 2)), bool>);
-  static_assert(std::is_same_v<decltype(logicalOrVoid(1, 2)), bool>);
-#endif
   return 0;
 }

sycl/test/group_algorithms/logical_or_and_group_algorithms.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -Xclang -verify=expected -Xclang -verify-ignore-unexpected=note -fpreview-breaking-changes -fsyntax-only -fsycl-device-only -ferror-limit=0 %s
+// RUN: %clangxx -fsycl -Xclang -verify=expected -Xclang -verify-ignore-unexpected=note -fsyntax-only -fsycl-device-only -ferror-limit=0 %s
 
 #include <sycl/group_algorithm.hpp>