Address reviews. Remove null check.

Author: uditagarwal97

sycl/source/detail/handler_impl.hpp

@@ -31,10 +31,8 @@ enum class HandlerSubmissionState : std::uint8_t {
 
 class handler_impl {
 public:
-  handler_impl(
-      std::shared_ptr<queue_impl> SubmissionPrimaryQueue,
-      [[maybe_unused]] std::shared_ptr<queue_impl> SubmissionSecondaryQueue,
-      bool EventNeeded)
+  handler_impl(std::shared_ptr<queue_impl> SubmissionPrimaryQueue,
+               bool EventNeeded)
       : MSubmissionPrimaryQueue(std::move(SubmissionPrimaryQueue)),
         MEventNeeded(EventNeeded) {};
 

sycl/source/handler.cpp

@@ -316,12 +316,12 @@ handler::handler(std::shared_ptr<detail::queue_impl> Queue,
                  bool CallerNeedsEvent)
     : handler(Queue, Queue, nullptr, CallerNeedsEvent) {}
 
-handler::handler(std::shared_ptr<detail::queue_impl> Queue,
-                 std::shared_ptr<detail::queue_impl> PrimaryQueue,
-                 std::shared_ptr<detail::queue_impl> SecondaryQueue,
-                 bool CallerNeedsEvent)
+handler::handler(
+    std::shared_ptr<detail::queue_impl> Queue,
+    std::shared_ptr<detail::queue_impl> PrimaryQueue,
+    [[maybe_unused]] std::shared_ptr<detail::queue_impl> SecondaryQueue,
+    bool CallerNeedsEvent)
     : impl(std::make_shared<detail::handler_impl>(std::move(PrimaryQueue),
-                                                  std::move(SecondaryQueue),
                                                   CallerNeedsEvent)),
       MQueue(std::move(Queue)) {}
 
@@ -1908,30 +1908,27 @@ void handler::verifyDeviceHasProgressGuarantee(
 }
 
 bool handler::supportsUSMMemcpy2D() {
-  auto &QueueImpl = impl->MSubmissionPrimaryQueue;
-  if (QueueImpl && !checkContextSupports(QueueImpl->getContextImplPtr(),
-                                         UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT))
-    return false;
-
-  return true;
+  assert(impl->MSubmissionPrimaryQueue &&
+         "handler should not have a null primary queue.");
+  return checkContextSupports(
+      impl->MSubmissionPrimaryQueue->getContextImplPtr(),
+      UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT);
 }
 
 bool handler::supportsUSMFill2D() {
-  auto &QueueImpl = impl->MSubmissionPrimaryQueue;
-  if (QueueImpl && !checkContextSupports(QueueImpl->getContextImplPtr(),
-                                         UR_CONTEXT_INFO_USM_FILL2D_SUPPORT))
-    return false;
-
-  return true;
+  assert(impl->MSubmissionPrimaryQueue &&
+         "handler should not have a null primary queue.");
+  return checkContextSupports(
+      impl->MSubmissionPrimaryQueue->getContextImplPtr(),
+      UR_CONTEXT_INFO_USM_FILL2D_SUPPORT);
 }
 
 bool handler::supportsUSMMemset2D() {
-  auto &QueueImpl = impl->MSubmissionPrimaryQueue;
-  if (QueueImpl && !checkContextSupports(QueueImpl->getContextImplPtr(),
-                                         UR_CONTEXT_INFO_USM_FILL2D_SUPPORT))
-    return false;
-
-  return true;
+  assert(impl->MSubmissionPrimaryQueue &&
+         "handler should not have a null primary queue.");
+  return checkContextSupports(
+      impl->MSubmissionPrimaryQueue->getContextImplPtr(),
+      UR_CONTEXT_INFO_USM_FILL2D_SUPPORT);
 }
 
 id<2> handler::computeFallbackKernelBounds(size_t Width, size_t Height) {