Merge dee75543bd into 133b19f205

rpcs3/Emu/Cell/SPULLVMRecompiler.cpp

@@ -1577,11 +1577,10 @@ public:
 			return add_loc->compiled;
 		}
 
-		bool add_to_file = false;
-
 		if (auto& cache = g_fxo->get<spu_cache>(); cache && g_cfg.core.spu_cache && !add_loc->cached.exchange(1))
 		{
-			add_to_file = true;
+			cache.add(func);
+			spu_log.success("New SPU block detected (size=%u)", func_size);
 		}
 
 		{
@@ -2815,14 +2814,6 @@ public:
 				fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append, llvm_log);
 			}
 
-			if (auto& cache = g_fxo->get<spu_cache>())
-			{
-				if (add_to_file)
-				{
-					cache.add(func);
-				}
-			}
-
 			fmt::throw_exception("Compilation failed");
 		}
 
@@ -2851,14 +2842,6 @@ 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;
 		}
 
@@ -2879,16 +2862,6 @@ public:
 		asm("DSB ISH");
 #endif
 
-		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);
-		}
-
 		return fn;
 	}