From 8ab8de53547cd8d35a5e52f4d64c1e652e133578 Mon Sep 17 00:00:00 2001
From: "Zhao, Yang2" <yang2.zhao@intel.com>
Date: Mon, 20 Jan 2025 00:04:27 -0800
Subject: [PATCH] fix release order

---
 source/loader/layers/sanitizer/asan/asan_ddi.cpp | 2 +-
 source/loader/layers/sanitizer/msan/msan_ddi.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/loader/layers/sanitizer/asan/asan_ddi.cpp b/source/loader/layers/sanitizer/asan/asan_ddi.cpp
index 67dd96c39e..db7100133f 100644
--- a/source/loader/layers/sanitizer/asan/asan_ddi.cpp
+++ b/source/loader/layers/sanitizer/asan/asan_ddi.cpp
@@ -1368,12 +1368,12 @@ __urdlllocal ur_result_t urKernelRelease(
     }
 
     getContext()->logger.debug("==== urKernelRelease");
-    UR_CALL(pfnRelease(hKernel));
 
     auto &KernelInfo = getAsanInterceptor()->getOrCreateKernelInfo(hKernel);
     if (--KernelInfo.RefCount == 0) {
         UR_CALL(getAsanInterceptor()->eraseKernelInfo(hKernel));
     }
+    UR_CALL(pfnRelease(hKernel));
 
     return UR_RESULT_SUCCESS;
 }
diff --git a/source/loader/layers/sanitizer/msan/msan_ddi.cpp b/source/loader/layers/sanitizer/msan/msan_ddi.cpp
index a0fac2da75..cc7cfb1ee4 100644
--- a/source/loader/layers/sanitizer/msan/msan_ddi.cpp
+++ b/source/loader/layers/sanitizer/msan/msan_ddi.cpp
@@ -1281,12 +1281,12 @@ ur_result_t urKernelRelease(
     auto pfnRelease = getContext()->urDdiTable.Kernel.pfnRelease;
 
     getContext()->logger.debug("==== urKernelRelease");
-    UR_CALL(pfnRelease(hKernel));
 
     auto &KernelInfo = getMsanInterceptor()->getOrCreateKernelInfo(hKernel);
     if (--KernelInfo.RefCount == 0) {
         UR_CALL(getMsanInterceptor()->eraseKernelInfo(hKernel));
     }
+    UR_CALL(pfnRelease(hKernel));
 
     return UR_RESULT_SUCCESS;
 }