From fda4ff1f9d3441473af473b9431fd5e62efb9546 Mon Sep 17 00:00:00 2001
From: Saleel Kudchadker <Saleel.Kudchadker@amd.com>
Date: Mon, 16 Dec 2024 17:23:56 +0000
Subject: [PATCH] SWDEV-504340 - Move cast of cl_mem inside the condition

Change-Id: I9c91f5d945a8d8bd2b2f55e3d11ede66afe4eef7


[ROCm/clr commit: fa63919a6339ea2a61111981ba2362c97fbdf743]
---
 projects/clr/rocclr/device/rocm/rocblit.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/clr/rocclr/device/rocm/rocblit.hpp b/projects/clr/rocclr/device/rocm/rocblit.hpp
index d7c6421025..1d9d0e670d 100644
--- a/projects/clr/rocclr/device/rocm/rocblit.hpp
+++ b/projects/clr/rocclr/device/rocm/rocblit.hpp
@@ -619,9 +619,10 @@ inline void KernelBlitManager::setArgument(amd::Kernel* kernel, size_t index,
       reinterpret_cast<Memory**>(kernel->parameters().values() +
         kernel->parameters().memoryObjOffset())[desc.info_.arrayIndex_] = nullptr;
     } else {
-      // convert cl_mem to amd::Memory*, return false if invalid.
-      amd::Memory* mem = as_amd(*static_cast<const cl_mem*>(value));
       if (!writeVAImmediate) {
+        // convert cl_mem to amd::Memory*, return false if invalid.
+        amd::Memory* mem = as_amd(*static_cast<const cl_mem*>(value));
+
         reinterpret_cast<amd::Memory**>(kernel->parameters().values() +
           kernel->parameters().memoryObjOffset())[desc.info_.arrayIndex_] = mem;
         if (dev_mem == nullptr) {