Skip to content

Commit d60b121

Browse files
Remove problems with null pointers in enqueue files
Change-Id: I751ea4a134deac5a2b87ea258b76f2dfb2c0900d Signed-off-by: Katarzyna Cencelewska <[email protected]>
1 parent d5ce501 commit d60b121

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

runtime/command_queue/enqueue_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void CommandQueueHw<GfxFamily>::forceDispatchScheduler(NEO::MultiDispatchInfo &m
105105
DispatchInfo dispatchInfo(&scheduler, 1, Vec3<size_t>(scheduler.getGws(), 1, 1), Vec3<size_t>(scheduler.getLws(), 1, 1), Vec3<size_t>(0, 0, 0));
106106

107107
auto devQueue = this->getContext().getDefaultDeviceQueue();
108-
DeviceQueueHw<GfxFamily> *devQueueHw = castToObject<DeviceQueueHw<GfxFamily>>(devQueue);
108+
DeviceQueueHw<GfxFamily> *devQueueHw = castToObjectOrAbort<DeviceQueueHw<GfxFamily>>(devQueue);
109109

110110
scheduler.createReflectionSurface();
111111
GraphicsAllocation *reflectionSurface = scheduler.getKernelReflectionSurface();

runtime/command_queue/enqueue_kernel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ cl_int CommandQueueHw<GfxFamily>::enqueueKernel(
3535
size_t workGroupSize[3] = {1, 1, 1};
3636
size_t enqueuedLocalWorkSize[3] = {0, 0, 0};
3737

38-
auto &kernel = *castToObject<Kernel>(clKernel);
38+
auto &kernel = *castToObjectOrAbort<Kernel>(clKernel);
3939
const auto &kernelInfo = kernel.getKernelInfo();
4040

4141
if (kernel.isParentKernel && !this->context->getDefaultDeviceQueue()) {

runtime/command_queue/enqueue_svm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ inline void CL_CALLBACK freeSvmEventClb(cl_event event,
4444
cl_int commandExecCallbackType,
4545
void *usrData) {
4646
auto freeDt = reinterpret_cast<SvmFreeUserData *>(usrData);
47-
auto eventObject = castToObject<Event>(event);
47+
auto eventObject = castToObjectOrAbort<Event>(event);
4848
if (freeDt->clb == nullptr) {
4949
auto ctx = eventObject->getContext();
5050
for (cl_uint i = 0; i < freeDt->numSvmPointers; i++) {
51-
castToObject<Context>(ctx)->getSVMAllocsManager()->freeSVMAlloc(freeDt->svmPointers[i]);
51+
castToObjectOrAbort<Context>(ctx)->getSVMAllocsManager()->freeSVMAlloc(freeDt->svmPointers[i]);
5252
}
5353
} else {
5454
freeDt->clb(eventObject->getCommandQueue(), freeDt->numSvmPointers,
5555
freeDt->svmPointers, freeDt->userData);
5656
}
5757
if (freeDt->ownsEventDeletion) {
58-
castToObject<Event>(event)->release();
58+
castToObjectOrAbort<Event>(event)->release();
5959
}
6060
delete freeDt;
6161
}

runtime/memory_manager/surface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class NullSurface : public Surface {
3535
class HostPtrSurface : public Surface {
3636
public:
3737
HostPtrSurface(void *ptr, size_t size) : memoryPointer(ptr), surfaceSize(size) {
38-
DEBUG_BREAK_IF(!ptr);
38+
UNRECOVERABLE_IF(!ptr);
3939
gfxAllocation = nullptr;
4040
}
4141

0 commit comments

Comments
 (0)