From 3130b4639fd8deb22ff099abd5cf36d03eced479 Mon Sep 17 00:00:00 2001
From: Jaydeep Patel <jaydeepkumar.patel@amd.com>
Date: Thu, 3 Oct 2024 17:21:58 +0000
Subject: [PATCH] SWDEV-487905 - device_ptr_ is being removed and its
 amd:Memory obj is being deleted during ihipFree in
 hip::StatCO::removeFatBinary.

Change-Id: I89d9fdeb53dc4ce0699f1f445a28486917a36e72


[ROCm/clr commit: 164cbcc531cbae97d9b9b4f7e81d4808bd3e91a8]
---
 projects/clr/hipamd/src/hip_global.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_global.cpp b/projects/clr/hipamd/src/hip_global.cpp
index 883a7adbad..c6878c8574 100644
--- a/projects/clr/hipamd/src/hip_global.cpp
+++ b/projects/clr/hipamd/src/hip_global.cpp
@@ -89,11 +89,9 @@ DeviceVar::DeviceVar(std::string name,
 }
 
 DeviceVar::~DeviceVar() {
-  if (amd_mem_obj_ != nullptr) {
-    amd::MemObjMap::RemoveMemObj(device_ptr_);
-    amd_mem_obj_->release();
-  }
-
+  // device_ptr_ is being removed and its amd:Memory obj is being released/deleted during
+  // ihipFree in hip::StatCO::removeFatBinary.
+  assert(amd::MemObjMap::FindMemObj(device_ptr_) == nullptr);
   if (shadowVptr != nullptr) {
     textureReference* texRef = reinterpret_cast<textureReference*>(shadowVptr);
     hipError_t err = ihipUnbindTexture(texRef);