P4 to Git Change 1709028 by skudchad@skudchad_test2_win_opencl on 2018/11/19 15:15:09

SWDEV-145570 - [HIP] Fix a bug in event tracking

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/16182/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.cpp#29 edit

rocclr/runtime/platform/commandqueue.cpp

@@ -184,6 +184,10 @@ void HostQueue::setLastQueuedCommand(Command* lastCommand) {
 Command* HostQueue::getLastQueuedCommand(bool retain) {
   // Get last submitted command
   ScopedLock sl(queueLock_);
+  if (lastEnqueueCommand_ == nullptr) {
+    return nullptr;
+  }
+
   if (retain) {
     lastEnqueueCommand_->retain();
   }