~queue destructor is supposed to call asynchronous exception handler. Presently we do this in ~queue_impl, which isn't exactly compliant with spec, because it's possible that queue_impl may outlive queue because of shared pointer.

Signed-off-by: Chris Perkins <[email protected]>

Author: cperkinsintel

sycl/include/sycl/queue.hpp

@@ -359,6 +359,8 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
 
   queue(queue &&RHS) = default;
 
+  ~queue();
+
   queue &operator=(const queue &RHS) = default;
 
   queue &operator=(queue &&RHS) = default;

sycl/source/detail/queue_impl.hpp

@@ -255,7 +255,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
       // notification and destroy the trace event for this queue.
       destructorNotification();
 #endif
-      throw_asynchronous();
+
       auto status =
           getAdapter().call_nocheck<UrApiKind::urQueueRelease>(MQueue);
       // If loader is already closed, it'll return a not-initialized status

sycl/source/queue.cpp

@@ -105,6 +105,10 @@ queue::queue(cl_command_queue clQueue, const context &SyclContext,
       *detail::getSyclObjImpl(SyclContext), AsyncHandler, PropList);
 }
 
+queue::~queue() {
+  impl->throw_asynchronous(); // <-- this should be safe in a noexcept context.
+}
+
 cl_command_queue queue::get() const { return impl->get(); }
 
 context queue::get_context() const { return impl->get_context(); }