From aee0b1db39dc4a28a6cddb8a72ef92d0f468987d Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <Ioannis.Assiouras@amd.com>
Date: Mon, 17 Jun 2024 14:50:25 +0100
Subject: [PATCH] SWDEV-468151 - Fixed segfault during destruction of
 arena_mem_obj

Change-Id: I1ebfa965bd243890dcb54d9b55992ae68c497bf0
---
 rocclr/device/device.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/rocclr/device/device.cpp b/rocclr/device/device.cpp
index 330f56e15f..f4b3fb2a2b 100644
--- a/rocclr/device/device.cpp
+++ b/rocclr/device/device.cpp
@@ -650,22 +650,21 @@ Device::Device()
 }
 
 Device::~Device() {
-  if (vaCacheMap_) {
-    CondLog(vaCacheMap_->size() != 0, "Application didn't unmap all host memory!");
-    delete vaCacheMap_;
-  }
-
   if (heap_buffer_ != nullptr) {
     delete heap_buffer_;
     heap_buffer_ = nullptr;
   }
 
-  delete vaCacheAccess_;
-
   if (arena_mem_obj_ != nullptr) {
     arena_mem_obj_->release();
   }
 
+  if (vaCacheMap_) {
+    CondLog(vaCacheMap_->size() != 0, "Application didn't unmap all host memory!");
+    delete vaCacheMap_;
+  }
+
+  delete vaCacheAccess_;
   delete settings_;
   delete[] info_.extensions_;
 }