wip

Author: AllanZyne

source/loader/layers/sanitizer/msan/msan_ddi.cpp

@@ -1390,7 +1390,10 @@ ur_result_t UR_APICALL urEnqueueUSMMemcpy(
 
     if (phEvent) {
         *phEvent = hEvent;
+    } else {
+        getContext()->urDdiTable.Event.pfnWait(1, &hEvent);
     }
+    // getContext()->urDdiTable.Queue.pfnFinish(hQueue);
 
     return UR_RESULT_SUCCESS;
 }

source/loader/layers/sanitizer/msan/msan_interceptor.cpp

@@ -386,13 +386,13 @@ MsanInterceptor::findAllocInfoByAddress(uptr Address) {
     std::shared_lock<ur_shared_mutex> Guard(m_AllocationMapMutex);
     auto It = m_AllocationMap.upper_bound(Address);
     if (It == m_AllocationMap.begin()) {
-        return std::optional<MsanAllocationIterator>{};
+        return std::nullopt;
     }
     --It;
-    // Make sure we got the right MsanAllocInfo
-    assert(Address >= It->second->AllocBegin &&
-           Address < It->second->AllocBegin + It->second->AllocSize &&
-           "Wrong MsanAllocInfo for the address");
+
+    if (Address < It->second->AllocBegin || Address >= It->second->AllocBegin + It->second->AllocSize) {
+        return std::nullopt;
+    }
     return It;
 }