[DO NOT MERGE][ABI-Break][SYCL] ABI-neutralize exception constructor

sycl/include/sycl/context.hpp

@@ -36,7 +36,6 @@ namespace sycl {
 inline namespace _V1 {
 // Forward declarations
 class device;
-class platform;
 
 namespace detail {
 class context_impl;

sycl/include/sycl/detail/array.hpp

@@ -10,9 +10,9 @@
 
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL_ALWAYS_INLINE
 #include <sycl/detail/pi.h>                   // for PI_ERROR_INVALID_VALUE
-#include <sycl/exception.hpp>                 // for invalid_parameter_error
 
 #include <stddef.h>    // for size_t
+#include <stdexcept>
 #include <type_traits> // for enable_if_t
 
 namespace sycl {
@@ -106,8 +106,7 @@ template <int dimensions = 1> class array {
   __SYCL_ALWAYS_INLINE void check_dimension(int dimension) const {
 #ifndef __SYCL_DEVICE_ONLY__
     if (dimension >= dimensions || dimension < 0) {
-      throw sycl::invalid_parameter_error("Index out of range",
-                                          PI_ERROR_INVALID_VALUE);
+      throw std::out_of_range("Index out of range");
     }
 #endif
     (void)dimension;

sycl/include/sycl/detail/property_list_base.hpp

@@ -10,7 +10,6 @@
 
 #include <sycl/detail/pi.h>                // for PI_ERROR_INVALID_VALUE
 #include <sycl/detail/property_helper.hpp> // for DataLessPropKind, Propert...
-#include <sycl/exception.hpp>              // for invalid_object_error
 
 #include <algorithm>   // for iter_swap
 #include <bitset>      // for bitset
@@ -92,15 +91,13 @@ class PropertyListBase {
   get_property_helper() const {
     const int PropKind = static_cast<int>(PropT::getKind());
     if (PropKind >= PropWithDataKind::PropWithDataKindSize)
-      throw sycl::invalid_object_error("The property is not found",
-                                       PI_ERROR_INVALID_VALUE);
+      throw std::invalid_argument("The property is not found");
 
     for (const std::shared_ptr<PropertyWithDataBase> &Prop : MPropsWithData)
       if (Prop->isSame(PropKind))
         return *static_cast<PropT *>(Prop.get());
 
-    throw sycl::invalid_object_error("The property is not found",
-                                     PI_ERROR_INVALID_VALUE);
+    throw std::invalid_argument("The property is not found");
   }
 
   void add_or_replace_accessor_properties_helper(

sycl/include/sycl/exception.hpp

@@ -10,7 +10,8 @@
 
 // 4.9.2 Exception Class Interface
 
-#include <sycl/backend_types.hpp>             // for backend
+#include <sycl/backend_types.hpp> // for backend
+#include <sycl/context.hpp>
 #include <sycl/detail/cl.h>                   // for cl_int
 #include <sycl/detail/common.hpp>             // for codeToString
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
@@ -26,8 +27,10 @@
 namespace sycl {
 inline namespace _V1 {
 
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
 // Forward declaration
 class context;
+#endif
 
 enum class errc : unsigned int {
   success = 0,
@@ -84,10 +87,13 @@ class __SYCL_EXPORT exception : public virtual std::exception {
   exception(int, const std::error_category &, const char *);
   exception(int, const std::error_category &);
 
-  exception(context, std::error_code, const std::string &);
+  exception(context Ctx, std::error_code Ec, const std::string &WhatArg)
+      : exception(Ec, std::make_shared<context>(Ctx), WhatArg.c_str()) {}
+  exception(context Ctx, int EV, const std::error_category &ECat,
+            const std::string &WhatArg)
+      : exception(Ctx, {EV, ECat}, WhatArg) {}
   exception(context, std::error_code, const char *);
   exception(context, std::error_code);
-  exception(context, int, const std::error_category &, const std::string &);
   exception(context, int, const std::error_category &, const char *);
   exception(context, int, const std::error_category &);
 

sycl/include/sycl/ext/intel/experimental/online_compiler.hpp

@@ -11,6 +11,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 #include <sycl/detail/export.hpp>             // for __SYCL_EXPORT
 #include <sycl/device.hpp>
+#include <sycl/exception.hpp>
 
 #include <string>
 #include <vector>

sycl/include/sycl/id.hpp

@@ -9,10 +9,8 @@
 #pragma once
 
 #include <sycl/detail/array.hpp>              // for array
-#include <sycl/detail/common.hpp>             // for InitializedVal
 #include <sycl/detail/defines.hpp>            // for __SYCL_ASSUME_INT
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL_DEPRECATED, __SYCL_A...
-#include <sycl/exception.hpp> // for make_error_code, errc, exce...
 #include <sycl/range.hpp>     // for range
 
 #include <stddef.h>    // for size_t

sycl/include/sycl/property_list.hpp

@@ -11,7 +11,6 @@
 #include <sycl/detail/pi.h>                    // for PI_ERROR_INVALID_VALUE
 #include <sycl/detail/property_helper.hpp>     // for DataLessPropKind, Pro...
 #include <sycl/detail/property_list_base.hpp>  // for PropertyListBase
-#include <sycl/exception.hpp>                  // for invalid_object_error
 #include <sycl/properties/property_traits.hpp> // for is_property
 
 #include <bitset>      // for bitset
@@ -46,9 +45,7 @@ class property_list : protected detail::PropertyListBase {
 
   template <typename PropT> PropT get_property() const {
     if (!has_property<PropT>())
-      throw sycl::invalid_object_error("The property is not found",
-                                       PI_ERROR_INVALID_VALUE);
-
+      throw std::invalid_argument("The property is not found");
     return get_property_helper<PropT>();
   }
 

sycl/source/exception.cpp

@@ -29,10 +29,6 @@ exception::exception(int EV, const std::error_category &ECat,
 exception::exception(int EV, const std::error_category &ECat)
     : exception({EV, ECat}, nullptr, "") {}
 
-exception::exception(context Ctx, std::error_code EC,
-                     const std::string &WhatArg)
-    : exception(EC, std::make_shared<context>(Ctx), WhatArg) {}
-
 exception::exception(context Ctx, std::error_code EC, const char *WhatArg)
     : exception(Ctx, EC, std::string(WhatArg)) {}
 
@@ -43,10 +39,6 @@ exception::exception(context Ctx, int EV, const std::error_category &ECat,
                      const char *WhatArg)
     : exception(Ctx, {EV, ECat}, std::string(WhatArg)) {}
 
-exception::exception(context Ctx, int EV, const std::error_category &ECat,
-                     const std::string &WhatArg)
-    : exception(Ctx, {EV, ECat}, WhatArg) {}
-
 exception::exception(context Ctx, int EV, const std::error_category &ECat)
     : exception(Ctx, EV, ECat, "") {}
 

sycl/test-e2e/InorderQueue/in_order_get_property.cpp

@@ -24,7 +24,7 @@ int main() {
     Queue1.get_property<property::queue::in_order>();
     assert(false && "Queue1 was created without any properties therefore get "
                     "property should fail.");
-  } catch (const invalid_object_error &e) {
+  } catch (const std::invalid_argument &e) {
     std::string ErrorMessage = e.what();
     assert(
         (ErrorMessage.find("The property is not found") != std::string::npos) &&

sycl/test/abi/sycl_symbols_linux.dump

@@ -3644,21 +3644,17 @@ _ZN4sycl3_V18platformC2ERKNS0_6deviceE
 _ZN4sycl3_V18platformC2Ev
 _ZN4sycl3_V19exceptionC1ENS0_7contextESt10error_code
 _ZN4sycl3_V19exceptionC1ENS0_7contextESt10error_codePKc
-_ZN4sycl3_V19exceptionC1ENS0_7contextESt10error_codeRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 _ZN4sycl3_V19exceptionC1ENS0_7contextEiRKNSt3_V214error_categoryE
 _ZN4sycl3_V19exceptionC1ENS0_7contextEiRKNSt3_V214error_categoryEPKc
-_ZN4sycl3_V19exceptionC1ENS0_7contextEiRKNSt3_V214error_categoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 _ZN4sycl3_V19exceptionC1ESt10error_code
 _ZN4sycl3_V19exceptionC1ESt10error_codePKc
 _ZN4sycl3_V19exceptionC1ESt10error_codeSt10shared_ptrINS0_7contextEEPKc
 _ZN4sycl3_V19exceptionC1EiRKNSt3_V214error_categoryE
 _ZN4sycl3_V19exceptionC1EiRKNSt3_V214error_categoryEPKc
 _ZN4sycl3_V19exceptionC2ENS0_7contextESt10error_code
 _ZN4sycl3_V19exceptionC2ENS0_7contextESt10error_codePKc
-_ZN4sycl3_V19exceptionC2ENS0_7contextESt10error_codeRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 _ZN4sycl3_V19exceptionC2ENS0_7contextEiRKNSt3_V214error_categoryE
 _ZN4sycl3_V19exceptionC2ENS0_7contextEiRKNSt3_V214error_categoryEPKc
-_ZN4sycl3_V19exceptionC2ENS0_7contextEiRKNSt3_V214error_categoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
 _ZN4sycl3_V19exceptionC2ESt10error_code
 _ZN4sycl3_V19exceptionC2ESt10error_codePKc
 _ZN4sycl3_V19exceptionC2ESt10error_codeSt10shared_ptrINS0_7contextEEPKc
@@ -4093,14 +4089,14 @@ _ZNK4sycl3_V16device9getNativeEv
 _ZNK4sycl3_V16kernel11get_backendEv
 _ZNK4sycl3_V16kernel11get_contextEv
 _ZNK4sycl3_V16kernel13getNativeImplEv
-_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info6device15backend_versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
-_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info6device7versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
-_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info8platform7versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
 _ZNK4sycl3_V16kernel13get_info_implINS0_4info6kernel10attributesEEENS0_6detail11ABINeutralTINS6_19is_kernel_info_descIT_E11return_typeEE4typeEv
 _ZNK4sycl3_V16kernel13get_info_implINS0_4info6kernel13function_nameEEENS0_6detail11ABINeutralTINS6_19is_kernel_info_descIT_E11return_typeEE4typeEv
 _ZNK4sycl3_V16kernel13get_info_implINS0_4info6kernel15reference_countEEENS0_6detail11ABINeutralTINS6_19is_kernel_info_descIT_E11return_typeEE4typeEv
 _ZNK4sycl3_V16kernel13get_info_implINS0_4info6kernel7contextEEENS0_6detail11ABINeutralTINS6_19is_kernel_info_descIT_E11return_typeEE4typeEv
 _ZNK4sycl3_V16kernel13get_info_implINS0_4info6kernel8num_argsEEENS0_6detail11ABINeutralTINS6_19is_kernel_info_descIT_E11return_typeEE4typeEv
+_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info6device15backend_versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
+_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info6device7versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
+_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info8platform7versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
 _ZNK4sycl3_V16kernel17get_kernel_bundleEv
 _ZNK4sycl3_V16kernel19ext_oneapi_get_infoINS0_3ext6oneapi12experimental4info21kernel_queue_specific23max_num_work_group_syncEEENT_11return_typeERKNS0_5queueE
 _ZNK4sycl3_V16kernel3getEv