From dabef1811b895ae2155553db87205eaa0bde1619 Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Wed, 13 Aug 2025 01:17:15 +0100
Subject: [PATCH] [core/memory] remove 1 level of indirection by using std
 optional

Signed-off-by: lizzie <lizzie@eden-emu.dev>
---
 src/core/memory.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 0035c626e2..d63ccc8965 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -61,8 +61,7 @@ struct Memory::Impl {
         }
 
 #ifdef __linux__
-        heap_tracker.emplace(system.DeviceMemory().buffer);
-        buffer = std::addressof(*heap_tracker);
+        buffer.emplace(system.DeviceMemory().buffer);
 #else
         buffer = std::addressof(system.DeviceMemory().buffer);
 #endif
@@ -1024,9 +1023,8 @@ struct Memory::Impl {
     std::span<Core::GPUDirtyMemoryManager> gpu_dirty_managers;
     std::mutex sys_core_guard;
 
-    std::optional<Common::HeapTracker> heap_tracker;
 #ifdef __linux__
-    Common::HeapTracker* buffer{};
+    std::optional<Common::HeapTracker> buffer;
 #else
     Common::HostMemory* buffer{};
 #endif