Merge pull request #1592 from nrspruit/fix_event_use_after_delete

[L0] Fix timestamp event evict after delete

Author: kbenzie

source/adapters/level_zero/event.cpp

@@ -1014,15 +1014,7 @@ ur_result_t urEventReleaseInternal(ur_event_handle_t Event) {
   }
 
   // Save pointer to the queue before deleting/resetting event.
-  // When we add an event to the cache we need to check whether profiling is
-  // enabled or not, so we access properties of the queue and that's why queue
-  // must released later.
   auto Queue = Event->UrQueue;
-  if (DisableEventsCaching || !Event->OwnNativeHandle) {
-    delete Event;
-  } else {
-    Event->Context->addEventToContextCache(Event);
-  }
 
   // If the event was a timestamp recording, we try to evict its entry in the
   // queue.
@@ -1041,6 +1033,15 @@ ur_result_t urEventReleaseInternal(ur_event_handle_t Event) {
     }
   }
 
+  // When we add an event to the cache we need to check whether profiling is
+  // enabled or not, so we access properties of the queue and that's why queue
+  // must released later.
+  if (DisableEventsCaching || !Event->OwnNativeHandle) {
+    delete Event;
+  } else {
+    Event->Context->addEventToContextCache(Event);
+  }
+
   // We intentionally incremented the reference counter when an event is
   // created so that we can avoid ur_queue_handle_t is released before the
   // associated ur_event_handle_t is released. Here we have to decrement it so