Skip to content

Commit 8464d43

Browse files
committed
Fix faultu merge
Signed-off-by: Larsen, Steffen <[email protected]>
1 parent 03cd76b commit 8464d43

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

sycl/include/sycl/queue.hpp

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -436,27 +436,18 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
436436
/// Submits a command group function object to the queue, in order to be
437437
/// scheduled for execution on the device.
438438
///
439-
/// On a kernel error, this command group function object is then scheduled
440-
/// for execution on a secondary queue.
441-
///
442439
/// \param CGF is a function object containing command group.
443-
/// \param SecondaryQueue is a fallback SYCL queue.
440+
/// \param SecondaryQueue is a fallback SYCL queue. (unused)
444441
/// \param CodeLoc is the code location of the submit call (default argument)
445442
/// \return a SYCL event object, which corresponds to the queue the command
446443
/// group is being enqueued on.
447444
template <typename T>
448445
std::enable_if_t<std::is_invocable_r_v<void, T, handler &>, event> submit(
449-
T CGF, queue &SecondaryQueue,
446+
T CGF, [[maybe_unused]] queue &SecondaryQueue,
450447
const detail::code_location &CodeLoc = detail::code_location::current()) {
451-
try {
452-
return submit_with_event<__SYCL_USE_FALLBACK_ASSERT>(
453-
sycl::ext::oneapi::experimental::empty_properties_t{},
454-
detail::type_erased_cgfo_ty{CGF}, CodeLoc);
455-
} catch (...) {
456-
return SecondaryQueue.submit_with_event<__SYCL_USE_FALLBACK_ASSERT>(
457-
sycl::ext::oneapi::experimental::empty_properties_t{},
458-
detail::type_erased_cgfo_ty{CGF}, CodeLoc);
459-
}
448+
return submit_with_event<__SYCL_USE_FALLBACK_ASSERT>(
449+
sycl::ext::oneapi::experimental::empty_properties_t{},
450+
detail::type_erased_cgfo_ty{CGF}, CodeLoc);
460451
}
461452

462453
/// Prevents any commands submitted afterward to this queue from executing

0 commit comments

Comments
 (0)