[SYCL] Include <complex>/<cmath> from sycl.hpp, unless SYCL2020_CONFORMANT_APIS (#11326)

aelovikov-intel · web-flow · commit d22c9c58d2e7 · 2023-09-28T12:08:34.000+01:00
#11274 and #11196 could break customers code that relied on implicit inclusion of those headers. Don't break it before the next ABI breaking window.
diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp
@@ -91,3 +91,9 @@
 #include <sycl/ext/oneapi/sub_group.hpp>
 #include <sycl/ext/oneapi/sub_group_mask.hpp>
 #include <sycl/ext/oneapi/weak_object.hpp>
+
+#ifndef SYCL2020_CONFORMANT_APIS
+// We used to include those and some code might be reliant on that.
+#include <cmath>
+#include <complex>
+#endif
diff --git a/sycl/test/basic_tests/no_math_in_global_ns.cpp b/sycl/test/basic_tests/no_math_in_global_ns.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=warning,note
+// RUN: %clangxx -DSYCL2020_CONFORMANT_APIS=1 -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=warning,note
 // expected-no-diagnostics
 
 // MSVC has the following includes:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=warning,note`
	`1`	`+// RUN: %clangxx -DSYCL2020_CONFORMANT_APIS=1 -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=warning,note`
`2`	`2`	`// expected-no-diagnostics`
`3`	`3`
`4`	`4`	`// MSVC has the following includes:`