From 10e8224a63aa2da5d650a1525292fabf21b49fe0 Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Tue, 10 Feb 2026 00:15:42 +0900
Subject: [PATCH] [CPU] Use RAII lock_guard in GuestTrampolineGroup

---
 src/xenia/cpu/backend/backend.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/xenia/cpu/backend/backend.h b/src/xenia/cpu/backend/backend.h
index 80dea76e8..8e552ab56 100644
--- a/src/xenia/cpu/backend/backend.h
+++ b/src/xenia/cpu/backend/backend.h
@@ -133,30 +133,25 @@ struct GuestTrampolineGroup
   xe_mutex m_mutex;
 
   uint32_t _NewTrampoline(SimpleGuestTrampolineProc proc, bool longterm) {
-    uint32_t result;
-    m_mutex.lock();
+    std::lock_guard<xe_mutex> lock(m_mutex);
     auto iter = this->find(proc);
     if (iter == this->end()) {
       uint32_t new_entry = longterm
                                ? m_backend->CreateLongTermGuestTrampoline(proc)
                                : m_backend->CreateGuestTrampoline(proc);
       this->emplace_hint(iter, proc, new_entry);
-      result = new_entry;
-    } else {
-      result = iter->second;
+      return new_entry;
     }
-    m_mutex.unlock();
-    return result;
+    return iter->second;
   }
 
  public:
   GuestTrampolineGroup(Backend* backend) : m_backend(backend) {}
   ~GuestTrampolineGroup() {
-    m_mutex.lock();
+    std::lock_guard<xe_mutex> lock(m_mutex);
     for (auto&& entry : *this) {
       m_backend->FreeGuestTrampoline(entry.second);
     }
-    m_mutex.unlock();
   }
 
   uint32_t NewLongtermTrampoline(SimpleGuestTrampolineProc proc) {