From ecf7d4e59d15a5f9aee00479b735e9fc02620b8a Mon Sep 17 00:00:00 2001
From: Eladash <18193363+elad335@users.noreply.github.com>
Date: Thu, 7 Mar 2024 21:09:28 +0200
Subject: [PATCH] SPU LLVM: Postpone cache writes until compiled

---
 rpcs3/Emu/Cell/SPULLVMRecompiler.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
index 9f46662ac4..00cf2131de 100644
--- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
+++ b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
@@ -1138,9 +1138,11 @@ public:
 
 		std::string log;
 
+		bool add_to_file = false;
+
 		if (auto& cache = g_fxo->get<spu_cache>(); cache && g_cfg.core.spu_cache && !add_loc->cached.exchange(1))
 		{
-			cache.add(func);
+			add_to_file = true;
 		}
 
 		{
@@ -2096,6 +2098,14 @@ public:
 		// Rebuild trampoline if necessary
 		if (!m_spurt->rebuild_ubertrampoline(func.data[0]))
 		{
+			if (auto& cache = g_fxo->get<spu_cache>())
+			{
+				if (add_to_file)
+				{
+					cache.add(func);
+				}
+			}
+
 			return nullptr;
 		}
 
@@ -2116,8 +2126,13 @@ public:
 		asm("DSB ISH");
 #endif
 
-		if (g_fxo->get<spu_cache>().operator bool())
+		if (auto& cache = g_fxo->get<spu_cache>())
 		{
+			if (add_to_file)
+			{
+				cache.add(func);
+			}
+
 			spu_log.success("New SPU block compiled successfully (size=%u)", func_size);
 		}