[SYCL] logical operation return type is boolean

sycl/include/sycl/functional.hpp

@@ -24,13 +24,27 @@ 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.
 template <typename T = void> struct logical_and {
-  T operator()(const T &lhs, const T &rhs) const { return lhs && rhs; }
+#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
+  bool
+#else
+  T
+#endif
+  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; }
+#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
+  bool
+#else
+  T
+#endif
+  operator()(const T &lhs, const T &rhs) const {
+    return lhs || rhs;
+  }
 };
 
 template <> struct logical_or<void> : std::logical_or<void> {};

sycl/test/basic_tests/logical_operations.cpp

@@ -0,0 +1,19 @@
+// RUN: %clang -D__INTEL_PREVIEW_BREAKING_CHANGES -fsycl -o - %s
+// RUN: %clang -fsycl -o - %s
+
+#include <cassert>
+#include <sycl/functional.hpp>
+#include <type_traits>
+
+int main() {
+  const auto logicalAnd = sycl::logical_and<int>();
+  const auto logicalOr = sycl::logical_or<int>();
+#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
+  static_assert(std::is_same_v<decltype(logicalAnd(1, 2)), bool> == true);
+  static_assert(std::is_same_v<decltype(logicalOr(1, 2)), bool> == true);
+#else
+  static_assert(std::is_same_v<decltype(logicalAnd(1, 2)), int> == true);
+  static_assert(std::is_same_v<decltype(logicalOr(1, 2)), int> == true);
+#endif
+  return 0;
+}