[NFC][SYCL] Pass context_impl by raw ptr in CGHostTask ctor

sycl/source/detail/cg.hpp

@@ -726,9 +726,9 @@ class CGHostTask : public CG {
   std::vector<ArgDesc> MArgs;
 
   CGHostTask(std::shared_ptr<HostTask> HostTask, detail::queue_impl *Queue,
-             std::shared_ptr<detail::context_impl> Context,
-             std::vector<ArgDesc> Args, CG::StorageInitHelper CGData,
-             CGType Type, detail::code_location loc = {});
+             detail::context_impl *Context, std::vector<ArgDesc> Args,
+             CG::StorageInitHelper CGData, CGType Type,
+             detail::code_location loc = {});
 };
 
 } // namespace detail

sycl/source/detail/graph/graph_impl.cpp

@@ -1043,7 +1043,7 @@ EventImplPtr exec_graph_impl::enqueueHostTaskPartition(
   // dependencies for the current execution.
   std::unique_ptr<sycl::detail::CG> CommandGroup =
       std::make_unique<sycl::detail::CGHostTask>(sycl::detail::CGHostTask(
-          NodeCommandGroup->MHostTask, &Queue, NodeCommandGroup->MContext,
+          NodeCommandGroup->MHostTask, &Queue, NodeCommandGroup->MContext.get(),
           NodeCommandGroup->MArgs, std::move(CGData),
           NodeCommandGroup->getType()));
 

sycl/source/detail/graph/node_impl.hpp

@@ -287,8 +287,8 @@ class node_impl : public std::enable_shared_from_this<node_impl> {
       return std::make_unique<sycl::detail::CGHostTask>(
           sycl::detail::CGHostTask(
               std::move(HostTaskSPtr), CommandGroupPtr->MQueue.get(),
-              CommandGroupPtr->MContext, std::move(NewArgs), std::move(Data),
-              CommandGroupPtr->getType(), Loc));
+              CommandGroupPtr->MContext.get(), std::move(NewArgs),
+              std::move(Data), CommandGroupPtr->getType(), Loc));
     }
     case sycl::detail::CGType::Barrier:
     case sycl::detail::CGType::BarrierWaitlist:

sycl/source/detail/scheduler/commands.cpp

@@ -3875,13 +3875,13 @@ void UpdateCommandBufferCommand::emitInstrumentationData() {}
 bool UpdateCommandBufferCommand::producesPiEvent() const { return false; }
 
 CGHostTask::CGHostTask(std::shared_ptr<HostTask> HostTask,
-                       detail::queue_impl *Queue,
-                       std::shared_ptr<detail::context_impl> Context,
+                       detail::queue_impl *Queue, detail::context_impl *Context,
                        std::vector<ArgDesc> Args, CG::StorageInitHelper CGData,
                        CGType Type, detail::code_location loc)
     : CG(Type, std::move(CGData), std::move(loc)),
       MHostTask(std::move(HostTask)),
-      MQueue(Queue ? Queue->shared_from_this() : nullptr), MContext(Context),
+      MQueue(Queue ? Queue->shared_from_this() : nullptr),
+      MContext(Context ? Context->shared_from_this() : nullptr),
       MArgs(std::move(Args)) {}
 } // namespace detail
 } // namespace _V1

sycl/source/handler.cpp

@@ -733,8 +733,8 @@ event handler::finalize() {
     detail::context_impl &Context = impl->get_context();
     detail::queue_impl *Queue = impl->get_queue_or_null();
     CommandGroup.reset(new detail::CGHostTask(
-        std::move(impl->MHostTask), Queue, Context.shared_from_this(),
-        std::move(impl->MArgs), std::move(impl->CGData), getType(), MCodeLoc));
+        std::move(impl->MHostTask), Queue, &Context, std::move(impl->MArgs),
+        std::move(impl->CGData), getType(), MCodeLoc));
     break;
   }
   case detail::CGType::Barrier:

sycl/unittests/scheduler/SchedulerTestUtils.hpp

@@ -310,7 +310,7 @@ class MockHandlerCustomFinalize : public MockHandler {
     }
     case sycl::detail::CGType::CodeplayHostTask: {
       CommandGroup.reset(new sycl::detail::CGHostTask(
-          std::move(getHostTask()), getQueue(), getQueue()->getContextImplPtr(),
+          std::move(getHostTask()), getQueue(), &getQueue()->getContextImpl(),
           getArgs(), std::move(CGData), getType(), getCodeLoc()));
       break;
     }