Remove assertions to instead return error code

lbushi25 · May 27, 2024 · cd29bd7 · cd29bd7
1 parent b604f08
commit cd29bd7
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/source/adapters/opencl/usm.cpp b/source/adapters/opencl/usm.cpp
@@ -116,9 +116,11 @@ urUSMHostAlloc(ur_context_handle_t hContext, const ur_usm_desc_t *pUSMDesc,
 
   *ppMem = Ptr;
 
-  assert((Alignment == 0 ||
-          reinterpret_cast<std::uintptr_t>(*ppMem) % Alignment == 0) &&
-         "Allocation not aligned correctly!");
+  if (!(Alignment == 0 ||
+        reinterpret_cast<std::uintptr_t>(*ppMem) % Alignment == 0)) {
+    urUSMFree(hContext, Ptr);
+    return UR_RESULT_ERROR_UNSUPPORTED_ALIGNMENT;
+  }
 
   return UR_RESULT_SUCCESS;
 }
@@ -159,9 +161,11 @@ urUSMDeviceAlloc(ur_context_handle_t hContext, ur_device_handle_t hDevice,
 
   *ppMem = Ptr;
 
-  assert((Alignment == 0 ||
-          reinterpret_cast<std::uintptr_t>(*ppMem) % Alignment == 0) &&
-         "Allocation not aligned correctly!");
+  if (!(Alignment == 0 ||
+        reinterpret_cast<std::uintptr_t>(*ppMem) % Alignment == 0)) {
+    urUSMFree(hContext, Ptr);
+    return UR_RESULT_ERROR_UNSUPPORTED_ALIGNMENT;
+  }
 
   return UR_RESULT_SUCCESS;
 }
@@ -202,9 +206,11 @@ urUSMSharedAlloc(ur_context_handle_t hContext, ur_device_handle_t hDevice,
 
   *ppMem = Ptr;
 
-  assert((Alignment == 0 ||
-          reinterpret_cast<std::uintptr_t>(*ppMem) % Alignment == 0) &&
-         "Allocation not aligned correctly!");
+  if (!(Alignment == 0 ||
+        reinterpret_cast<std::uintptr_t>(*ppMem) % Alignment == 0)) {
+    urUSMFree(hContext, Ptr);
+    return UR_RESULT_ERROR_UNSUPPORTED_ALIGNMENT;
+  }
   return UR_RESULT_SUCCESS;
 }