Fixed merge failure

ianayl · ianayl · commit 6e301dbced9c · 2024-12-10T15:17:04.000-08:00
diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp
@@ -3257,8 +3257,7 @@ ur_result_t ExecCGCommand::enqueueImpQueue() {
         Result != UR_RESULT_SUCCESS)
       return Result;
 
-    if (Event)
-      MEvent->setHandle(*Event);
+    SetEventHandleOrDiscard();
     return UR_RESULT_SUCCESS;
   }
   // TODO Either remove "PrefetchUSMExpD2H" on next ABI breaking window,

Original file line number	Diff line number	Diff line change
`@@ -3257,8 +3257,7 @@ ur_result_t ExecCGCommand::enqueueImpQueue() {`
`3257`	`3257`	`Result != UR_RESULT_SUCCESS)`
`3258`	`3258`	`return Result;`
`3259`	`3259`
`3260`		`- if (Event)`
`3261`		`- MEvent->setHandle(*Event);`
	`3260`	`+ SetEventHandleOrDiscard();`
`3262`	`3261`	`return UR_RESULT_SUCCESS;`
`3263`	`3262`	`}`
`3264`	`3263`	`// TODO Either remove "PrefetchUSMExpD2H" on next ABI breaking window,`