PPCSymbolDB: Don't return non-const pointers

For thread safety, we shouldn't return any pointers or references that
can be used to mutate the state of the PPCSymbolDB. This should be the
final part of making PPCSymbolDB thread safe unless I've missed
something.

15 files changed, 172 insertions, 108 deletions

diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp
index 0784256f0b..2fa514ba86 100644
--- a/Source/Core/Common/SymbolDB.cpp
+++ b/Source/Core/Common/SymbolDB.cpp
@@ -80,7 +80,7 @@ void SymbolDB::Index(XFuncMap* functions)
   }
 }
 
-Symbol* SymbolDB::GetSymbolFromName(std::string_view name)
+const Symbol* SymbolDB::GetSymbolFromName(std::string_view name) const
 {
   std::lock_guard lock(m_mutex);
 
@@ -93,10 +93,10 @@ Symbol* SymbolDB::GetSymbolFromName(std::string_view name)
   return nullptr;
 }
 
-std::vector<Symbol*> SymbolDB::GetSymbolsFromName(std::string_view name)
+std::vector<const Symbol*> SymbolDB::GetSymbolsFromName(std::string_view name) const
 {
   std::lock_guard lock(m_mutex);
-  std::vector<Symbol*> symbols;
+  std::vector<const Symbol*> symbols;
 
   for (auto& func : m_functions)
   {
@@ -107,7 +107,7 @@ std::vector<Symbol*> SymbolDB::GetSymbolsFromName(std::string_view name)
   return symbols;
 }
 
-Symbol* SymbolDB::GetSymbolFromHash(u32 hash)
+const Symbol* SymbolDB::GetSymbolFromHash(u32 hash) const
 {
   std::lock_guard lock(m_mutex);
 
@@ -118,7 +118,7 @@ Symbol* SymbolDB::GetSymbolFromHash(u32 hash)
   return *iter->second.begin();
 }
 
-std::vector<Symbol*> SymbolDB::GetSymbolsFromHash(u32 hash)
+std::vector<const Symbol*> SymbolDB::GetSymbolsFromHash(u32 hash) const
 {
   std::lock_guard lock(m_mutex);
 
@@ -133,6 +133,33 @@ std::vector<Symbol*> SymbolDB::GetSymbolsFromHash(u32 hash)
 void SymbolDB::AddCompleteSymbol(const Symbol& symbol)
 {
   std::lock_guard lock(m_mutex);
-  m_functions.emplace(symbol.address, symbol);
+  m_functions[symbol.address] = symbol;
 }
+
+bool SymbolDB::RenameSymbol(const Symbol& symbol, const std::string& symbol_name)
+{
+  std::lock_guard lock(m_mutex);
+
+  auto it = m_functions.find(symbol.address);
+  if (it == m_functions.end())
+    return false;
+
+  it->second.Rename(symbol_name);
+  return true;
+}
+
+bool SymbolDB::RenameSymbol(const Symbol& symbol, const std::string& symbol_name,
+                            const std::string& object_name)
+{
+  std::lock_guard lock(m_mutex);
+
+  auto it = m_functions.find(symbol.address);
+  if (it == m_functions.end())
+    return false;
+
+  it->second.Rename(symbol_name);
+  it->second.object_name = object_name;
+  return true;
+}
+
 }  // namespace Common
diff --git a/Source/Core/Common/SymbolDB.h b/Source/Core/Common/SymbolDB.h
index b035b20c53..8a1767d696 100644
--- a/Source/Core/Common/SymbolDB.h
+++ b/Source/Core/Common/SymbolDB.h
@@ -14,6 +14,7 @@
 #include <utility>
 #include <vector>
 
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 
 namespace Core
@@ -88,18 +89,59 @@ public:
   SymbolDB();
   virtual ~SymbolDB();
 
-  virtual Symbol* GetSymbolFromAddr(u32 addr) { return nullptr; }
-  virtual Symbol* AddFunction(const Core::CPUThreadGuard& guard, u32 start_addr) { return nullptr; }
+  virtual const Symbol* GetSymbolFromAddr(u32 addr) const { return nullptr; }
+  virtual const Symbol* AddFunction(const Core::CPUThreadGuard& guard, u32 start_addr)
+  {
+    return nullptr;
+  }
   void AddCompleteSymbol(const Symbol& symbol);
+  bool RenameSymbol(const Symbol& symbol, const std::string& symbol_name);
+  bool RenameSymbol(const Symbol& symbol, const std::string& symbol_name,
+                    const std::string& object_name);
+
+  const Symbol* GetSymbolFromName(std::string_view name) const;
+  std::vector<const Symbol*> GetSymbolsFromName(std::string_view name) const;
+  const Symbol* GetSymbolFromHash(u32 hash) const;
+  std::vector<const Symbol*> GetSymbolsFromHash(u32 hash) const;
+
+  template <typename F>
+  void ForEachSymbol(F f) const
+  {
+    std::lock_guard lock(m_mutex);
+    for (const auto& [addr, symbol] : m_functions)
+      f(symbol);
+  }
 
-  Symbol* GetSymbolFromName(std::string_view name);
-  std::vector<Symbol*> GetSymbolsFromName(std::string_view name);
-  Symbol* GetSymbolFromHash(u32 hash);
-  std::vector<Symbol*> GetSymbolsFromHash(u32 hash);
+  template <typename F>
+  void ForEachSymbolWithMutation(F f)
+  {
+    std::lock_guard lock(m_mutex);
+    for (auto& [addr, symbol] : m_functions)
+    {
+      f(symbol);
+      ASSERT_MSG(COMMON, addr == symbol.address, "Symbol address was unexpectedly changed");
+    }
+  }
+
+  template <typename F>
+  void ForEachNote(F f) const
+  {
+    std::lock_guard lock(m_mutex);
+    for (const auto& [addr, note] : m_notes)
+      f(note);
+  }
+
+  template <typename F>
+  void ForEachNoteWithMutation(F f)
+  {
+    std::lock_guard lock(m_mutex);
+    for (auto& [addr, note] : m_notes)
+    {
+      f(note);
+      ASSERT_MSG(COMMON, addr == note.address, "Note address was unexpectedly changed");
+    }
+  }
 
-  const XFuncMap& Symbols() const { return m_functions; }
-  const XNoteMap& Notes() const { return m_notes; }
-  XFuncMap& AccessSymbols() { return m_functions; }
   bool IsEmpty() const;
   bool Clear(const char* prefix = "");
   void List();
@@ -112,6 +154,6 @@ protected:
   XNoteMap m_notes;
   XFuncPtrMap m_checksum_to_function;
   std::string m_map_name;
-  std::recursive_mutex m_mutex;
+  mutable std::recursive_mutex m_mutex;
 };
 }  // namespace Common
diff --git a/Source/Core/Core/Debugger/DebugInterface.h b/Source/Core/Core/Debugger/DebugInterface.h
index cc07d06d3b..607cbe8bba 100644
--- a/Source/Core/Core/Debugger/DebugInterface.h
+++ b/Source/Core/Core/Debugger/DebugInterface.h
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <optional>
 #include <string>
-#include <string_view>
 #include <vector>
 
 #include "Common/CommonTypes.h"
@@ -104,7 +103,7 @@ public:
   {
     return 0xFFFFFFFF;
   }
-  virtual std::string_view GetDescription(u32 /*address*/) const = 0;
+  virtual std::string GetDescription(u32 /*address*/) const = 0;
   virtual void Clear(const CPUThreadGuard& guard) = 0;
 };
 }  // namespace Core
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
index d0abe78be0..7ee5868fce 100644
--- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
+++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
@@ -80,7 +80,7 @@ bool GetCallstack(const Core::CPUThreadGuard& guard, std::vector<CallstackEntry>
   });
 
   WalkTheStack(guard, [&output, &ppc_symbol_db](u32 func_addr) {
-    std::string_view func_desc = ppc_symbol_db.GetDescription(func_addr);
+    std::string func_desc = ppc_symbol_db.GetDescription(func_addr);
     if (func_desc.empty() || func_desc == "Invalid")
       func_desc = "(unknown)";
 
@@ -107,14 +107,14 @@ void PrintCallstack(const Core::CPUThreadGuard& guard, Common::Log::LogType type
     GENERIC_LOG_FMT(type, level, " LR = 0 - this is bad");
   }
 
-  if (const std::string_view lr_desc = ppc_symbol_db.GetDescription(LR(ppc_state));
+  if (const std::string lr_desc = ppc_symbol_db.GetDescription(LR(ppc_state));
       lr_desc != ppc_symbol_db.GetDescription(ppc_state.pc))
   {
     GENERIC_LOG_FMT(type, level, " * {}  [ LR = {:08x} ]", lr_desc, LR(ppc_state));
   }
 
   WalkTheStack(guard, [type, level, &ppc_symbol_db](u32 func_addr) {
-    std::string_view func_desc = ppc_symbol_db.GetDescription(func_addr);
+    std::string func_desc = ppc_symbol_db.GetDescription(func_addr);
     if (func_desc.empty() || func_desc == "Invalid")
       func_desc = "(unknown)";
     GENERIC_LOG_FMT(type, level, " * {} [ addr = {:08x} ]", func_desc, func_addr);
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
index 2c840d0ae5..dea3aa25a9 100644
--- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp
+++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
@@ -439,7 +439,7 @@ u32 PPCDebugInterface::GetColor(const Core::CPUThreadGuard* guard, u32 address)
 }
 // =============
 
-std::string_view PPCDebugInterface::GetDescription(u32 address) const
+std::string PPCDebugInterface::GetDescription(u32 address) const
 {
   return m_ppc_symbol_db.GetDescription(address);
 }
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h
index 797f2d5254..456b987ab9 100644
--- a/Source/Core/Core/Debugger/PPCDebugInterface.h
+++ b/Source/Core/Core/Debugger/PPCDebugInterface.h
@@ -102,7 +102,7 @@ public:
   void Step() override {}
   void RunTo(u32 address) override;
   u32 GetColor(const Core::CPUThreadGuard* guard, u32 address) const override;
-  std::string_view GetDescription(u32 address) const override;
+  std::string GetDescription(u32 address) const override;
 
   std::shared_ptr<Core::NetworkCaptureLogger> NetworkLogger();
 
diff --git a/Source/Core/Core/Debugger/RSO.cpp b/Source/Core/Core/Debugger/RSO.cpp
index f793096967..7ee9481df3 100644
--- a/Source/Core/Core/Debugger/RSO.cpp
+++ b/Source/Core/Core/Debugger/RSO.cpp
@@ -381,7 +381,7 @@ void RSOView::Apply(const Core::CPUThreadGuard& guard, PPCSymbolDB* symbol_db) c
     u32 address = GetExportAddress(rso_export);
     if (address != 0)
     {
-      Common::Symbol* symbol = symbol_db->AddFunction(guard, address);
+      const Common::Symbol* symbol = symbol_db->AddFunction(guard, address);
       if (!symbol)
         symbol = symbol_db->GetSymbolFromAddr(address);
 
@@ -389,8 +389,7 @@ void RSOView::Apply(const Core::CPUThreadGuard& guard, PPCSymbolDB* symbol_db) c
       if (symbol)
       {
         // Function symbol
-        symbol->Rename(export_name);
-        symbol->object_name = rso_name;
+        symbol_db->RenameSymbol(*symbol, export_name, rso_name);
       }
       else
       {
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
index 06cbcbb9c4..c9050be730 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
@@ -187,7 +187,7 @@ void JitBaseBlockCache::FinalizeBlock(JitBlock& block, bool block_link,
     LinkBlock(block);
   }
 
-  Common::Symbol* symbol = nullptr;
+  const Common::Symbol* symbol = nullptr;
   if (Common::JitRegister::IsEnabled() &&
       (symbol = m_jit.m_ppc_symbol_db.GetSymbolFromAddr(block.effectiveAddress)) != nullptr)
   {
diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
index c8ab26f884..49338af10b 100644
--- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp
+++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
@@ -346,10 +346,10 @@ static void FindFunctionsFromHandlers(const Core::CPUThreadGuard& guard, PPCSymb
     if (read_result.valid && PPCTables::IsValidInstruction(read_result.hex, entry.first))
     {
       // Check if this function is already mapped
-      Common::Symbol* f = func_db->AddFunction(guard, entry.first);
+      const Common::Symbol* f = func_db->AddFunction(guard, entry.first);
       if (!f)
         continue;
-      f->Rename(entry.second);
+      func_db->RenameSymbol(*f, entry.second);
     }
   }
 }
@@ -359,8 +359,8 @@ static void FindFunctionsAfterReturnInstruction(const Core::CPUThreadGuard& guar
 {
   std::vector<u32> funcAddrs;
 
-  for (const auto& func : func_db->Symbols())
-    funcAddrs.push_back(func.second.address + func.second.size);
+  func_db->ForEachSymbol(
+      [&](const Common::Symbol& symbol) { funcAddrs.push_back(symbol.address + symbol.size); });
 
   auto& mmu = guard.GetSystem().GetMMU();
   for (u32& location : funcAddrs)
@@ -380,7 +380,7 @@ static void FindFunctionsAfterReturnInstruction(const Core::CPUThreadGuard& guar
       if (read_result.valid && PPCTables::IsValidInstruction(read_result.hex, location))
       {
         // check if this function is already mapped
-        Common::Symbol* f = func_db->AddFunction(guard, location);
+        const Common::Symbol* f = func_db->AddFunction(guard, location);
         if (!f)
           break;
         else
@@ -407,45 +407,45 @@ void FindFunctions(const Core::CPUThreadGuard& guard, u32 startAddr, u32 endAddr
   int numLeafs = 0, numNice = 0, numUnNice = 0;
   int numTimer = 0, numRFI = 0, numStraightLeaf = 0;
   int leafSize = 0, niceSize = 0, unniceSize = 0;
-  for (auto& func : func_db->AccessSymbols())
-  {
-    if (func.second.address == 4)
+  func_db->ForEachSymbolWithMutation([&](Common::Symbol& f) {
+    if (f.address == 4)
     {
       WARN_LOG_FMT(SYMBOLS, "Weird function");
-      continue;
-    }
-    AnalyzeFunction2(func_db, &(func.second));
-    Common::Symbol& f = func.second;
-    if (f.name.substr(0, 3) == "zzz")
-    {
-      if (f.flags & Common::FFLAG_LEAF)
-        f.Rename(f.name + "_leaf");
-      if (f.flags & Common::FFLAG_STRAIGHT)
-        f.Rename(f.name + "_straight");
-    }
-    if (f.flags & Common::FFLAG_LEAF)
-    {
-      numLeafs++;
-      leafSize += f.size;
-    }
-    else if (f.flags & Common::FFLAG_ONLYCALLSNICELEAFS)
-    {
-      numNice++;
-      niceSize += f.size;
     }
     else
     {
-      numUnNice++;
-      unniceSize += f.size;
-    }
+      AnalyzeFunction2(func_db, &f);
+      if (f.name.substr(0, 3) == "zzz")
+      {
+        if (f.flags & Common::FFLAG_LEAF)
+          f.Rename(f.name + "_leaf");
+        if (f.flags & Common::FFLAG_STRAIGHT)
+          f.Rename(f.name + "_straight");
+      }
+      if (f.flags & Common::FFLAG_LEAF)
+      {
+        numLeafs++;
+        leafSize += f.size;
+      }
+      else if (f.flags & Common::FFLAG_ONLYCALLSNICELEAFS)
+      {
+        numNice++;
+        niceSize += f.size;
+      }
+      else
+      {
+        numUnNice++;
+        unniceSize += f.size;
+      }
 
-    if (f.flags & Common::FFLAG_TIMERINSTRUCTIONS)
-      numTimer++;
-    if (f.flags & Common::FFLAG_RFI)
-      numRFI++;
-    if ((f.flags & Common::FFLAG_STRAIGHT) && (f.flags & Common::FFLAG_LEAF))
-      numStraightLeaf++;
-  }
+      if (f.flags & Common::FFLAG_TIMERINSTRUCTIONS)
+        numTimer++;
+      if (f.flags & Common::FFLAG_RFI)
+        numRFI++;
+      if ((f.flags & Common::FFLAG_STRAIGHT) && (f.flags & Common::FFLAG_LEAF))
+        numStraightLeaf++;
+    }
+  });
   if (numLeafs == 0)
     leafSize = 0;
   else
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
index 362d0ad6ee..02da35f94b 100644
--- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
@@ -35,7 +35,7 @@ PPCSymbolDB::PPCSymbolDB() = default;
 PPCSymbolDB::~PPCSymbolDB() = default;
 
 // Adds the function to the list, unless it's already there
-Common::Symbol* PPCSymbolDB::AddFunction(const Core::CPUThreadGuard& guard, u32 start_addr)
+const Common::Symbol* PPCSymbolDB::AddFunction(const Core::CPUThreadGuard& guard, u32 start_addr)
 {
   std::lock_guard lock(m_mutex);
 
@@ -158,7 +158,7 @@ void PPCSymbolDB::DetermineNoteLayers(XNoteMap* notes)
   }
 }
 
-Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr)
+const Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr) const
 {
   std::lock_guard lock(m_mutex);
   if (m_functions.empty())
@@ -183,7 +183,7 @@ Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr)
   return nullptr;
 }
 
-Common::Note* PPCSymbolDB::GetNoteFromAddr(u32 addr)
+const Common::Note* PPCSymbolDB::GetNoteFromAddr(u32 addr) const
 {
   std::lock_guard lock(m_mutex);
   if (m_notes.empty())
@@ -226,7 +226,7 @@ void PPCSymbolDB::DeleteNote(u32 start_address)
   m_notes.erase(start_address);
 }
 
-std::string_view PPCSymbolDB::GetDescription(u32 addr)
+std::string PPCSymbolDB::GetDescription(u32 addr) const
 {
   if (const Common::Symbol* const symbol = GetSymbolFromAddr(addr))
     return symbol->name;
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h
index 079328147d..d106f68aa4 100644
--- a/Source/Core/Core/PowerPC/PPCSymbolDB.h
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h
@@ -21,20 +21,20 @@ public:
   PPCSymbolDB();
   ~PPCSymbolDB() override;
 
-  Common::Symbol* AddFunction(const Core::CPUThreadGuard& guard, u32 start_addr) override;
+  const Common::Symbol* AddFunction(const Core::CPUThreadGuard& guard, u32 start_addr) override;
   void AddKnownSymbol(const Core::CPUThreadGuard& guard, u32 startAddr, u32 size,
                       const std::string& name, const std::string& object_name,
                       Common::Symbol::Type type = Common::Symbol::Type::Function);
   void AddKnownNote(u32 start_addr, u32 size, const std::string& name);
 
-  Common::Symbol* GetSymbolFromAddr(u32 addr) override;
+  const Common::Symbol* GetSymbolFromAddr(u32 addr) const override;
   bool NoteExists() const { return !m_notes.empty(); }
-  Common::Note* GetNoteFromAddr(u32 addr);
+  const Common::Note* GetNoteFromAddr(u32 addr) const;
   void DetermineNoteLayers();
   void DeleteFunction(u32 start_address);
   void DeleteNote(u32 start_address);
 
-  std::string_view GetDescription(u32 addr);
+  std::string GetDescription(u32 addr) const;
 
   void FillInCallers();
 
diff --git a/Source/Core/Core/PowerPC/SignatureDB/MEGASignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/MEGASignatureDB.cpp
index a6aefc088b..6b0f573b27 100644
--- a/Source/Core/Core/PowerPC/SignatureDB/MEGASignatureDB.cpp
+++ b/Source/Core/Core/PowerPC/SignatureDB/MEGASignatureDB.cpp
@@ -160,20 +160,18 @@ bool MEGASignatureDB::Save(const std::string& file_path) const
 
 void MEGASignatureDB::Apply(const Core::CPUThreadGuard& guard, PPCSymbolDB* symbol_db) const
 {
-  for (auto& it : symbol_db->AccessSymbols())
-  {
-    auto& symbol = it.second;
+  symbol_db->ForEachSymbol([&](const Common::Symbol& symbol) {
     for (const auto& sig : m_signatures)
     {
       if (Compare(guard, symbol.address, symbol.size, sig))
       {
-        symbol.name = sig.name;
+        symbol_db->RenameSymbol(symbol, sig.name);
         INFO_LOG_FMT(SYMBOLS, "Found {} at {:08x} (size: {:08x})!", sig.name, symbol.address,
                      symbol.size);
         break;
       }
     }
-  }
+  });
   symbol_db->Index();
 }
 
diff --git a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
index b9cec4a2be..c67000b9bb 100644
--- a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
+++ b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
@@ -128,7 +128,7 @@ void HashSignatureDB::Apply(const Core::CPUThreadGuard& guard, PPCSymbolDB* symb
     for (const auto& function : symbol_db->GetSymbolsFromHash(entry.first))
     {
       // Found the function. Let's rename it according to the symbol file.
-      function->Rename(entry.second.name);
+      symbol_db->RenameSymbol(*function, entry.second.name);
       if (entry.second.size == static_cast<unsigned int>(function->size))
       {
         INFO_LOG_FMT(SYMBOLS, "Found {} at {:08x} (size: {:08x})!", entry.second.name,
@@ -146,18 +146,17 @@ void HashSignatureDB::Apply(const Core::CPUThreadGuard& guard, PPCSymbolDB* symb
 
 void HashSignatureDB::Populate(const PPCSymbolDB* symbol_db, const std::string& filter)
 {
-  for (const auto& symbol : symbol_db->Symbols())
-  {
-    if ((filter.empty() && (!symbol.second.name.empty()) &&
-         symbol.second.name.substr(0, 3) != "zz_" && symbol.second.name.substr(0, 1) != ".") ||
-        ((!filter.empty()) && symbol.second.name.substr(0, filter.size()) == filter))
+  symbol_db->ForEachSymbol([&](const Common::Symbol& symbol) {
+    if ((filter.empty() && (!symbol.name.empty()) && symbol.name.substr(0, 3) != "zz_" &&
+         symbol.name.substr(0, 1) != ".") ||
+        ((!filter.empty()) && symbol.name.substr(0, filter.size()) == filter))
     {
       DBFunc temp_dbfunc;
-      temp_dbfunc.name = symbol.second.name;
-      temp_dbfunc.size = symbol.second.size;
-      m_database[symbol.second.hash] = temp_dbfunc;
+      temp_dbfunc.name = symbol.name;
+      temp_dbfunc.size = symbol.size;
+      m_database[symbol.hash] = temp_dbfunc;
     }
-  }
+  });
 }
 
 u32 HashSignatureDB::ComputeCodeChecksum(const Core::CPUThreadGuard& guard, u32 offsetStart,
diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
index a430be15a3..f94b640c41 100644
--- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
@@ -335,7 +335,7 @@ void CodeViewWidget::Update(const Core::CPUThreadGuard* guard)
 
     std::string ins = (split == std::string::npos ? disas : disas.substr(0, split));
     std::string param = (split == std::string::npos ? "" : disas.substr(split + 1));
-    const std::string_view desc = debug_interface.GetDescription(addr);
+    const std::string desc = debug_interface.GetDescription(addr);
 
     const Common::Note* note = m_ppc_symbol_db.GetNoteFromAddr(addr);
     std::string note_string;
@@ -950,7 +950,7 @@ void CodeViewWidget::OnFollowBranch()
 void CodeViewWidget::OnEditSymbol()
 {
   const u32 addr = GetContextAddress();
-  Common::Symbol* const symbol = m_ppc_symbol_db.GetSymbolFromAddr(addr);
+  const Common::Symbol* const symbol = m_ppc_symbol_db.GetSymbolFromAddr(addr);
 
   if (symbol == nullptr)
   {
@@ -974,12 +974,14 @@ void CodeViewWidget::OnEditSymbol()
   }
 
   if (symbol->name != name)
-    symbol->Rename(name);
+    m_ppc_symbol_db.RenameSymbol(*symbol, name);
 
   if (symbol->size != size)
   {
     Core::CPUThreadGuard guard(m_system);
-    PPCAnalyst::ReanalyzeFunction(guard, symbol->address, *symbol, size);
+    Common::Symbol new_symbol = *symbol;
+    PPCAnalyst::ReanalyzeFunction(guard, symbol->address, new_symbol, size);
+    m_ppc_symbol_db.AddCompleteSymbol(new_symbol);
   }
 
   emit Host::GetInstance()->PPCSymbolsChanged();
@@ -988,7 +990,7 @@ void CodeViewWidget::OnEditSymbol()
 void CodeViewWidget::OnDeleteSymbol()
 {
   const u32 addr = GetContextAddress();
-  Common::Symbol* const symbol = m_ppc_symbol_db.GetSymbolFromAddr(addr);
+  const Common::Symbol* const symbol = m_ppc_symbol_db.GetSymbolFromAddr(addr);
 
   if (symbol == nullptr)
     return;
@@ -1039,7 +1041,7 @@ void CodeViewWidget::OnSelectionChanged()
 void CodeViewWidget::OnEditNote()
 {
   const u32 context_address = GetContextAddress();
-  Common::Note* const note = m_ppc_symbol_db.GetNoteFromAddr(context_address);
+  const Common::Note* const note = m_ppc_symbol_db.GetNoteFromAddr(context_address);
 
   if (note == nullptr)
     return;
@@ -1071,7 +1073,7 @@ void CodeViewWidget::OnEditNote()
 void CodeViewWidget::OnDeleteNote()
 {
   const u32 context_address = GetContextAddress();
-  Common::Note* const note = m_ppc_symbol_db.GetNoteFromAddr(context_address);
+  const Common::Note* const note = m_ppc_symbol_db.GetNoteFromAddr(context_address);
 
   if (note == nullptr)
     return;
diff --git a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
index e5aaa1c2cd..3e4eedf49d 100644
--- a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
@@ -423,14 +423,13 @@ void CodeWidget::UpdateSymbols()
                                 m_symbols_list->selectedItems()[0]->text();
   m_symbols_list->clear();
 
-  for (const auto& symbol : m_ppc_symbol_db.Symbols())
-  {
-    QString name = QString::fromStdString(symbol.second.name);
+  m_ppc_symbol_db.ForEachSymbol([&](const Common::Symbol& symbol) {
+    QString name = QString::fromStdString(symbol.name);
 
     // If the symbol has an object name, add it to the entry name.
-    if (!symbol.second.object_name.empty())
+    if (!symbol.object_name.empty())
     {
-      name += QString::fromStdString(fmt::format(" ({})", symbol.second.object_name));
+      name += QString::fromStdString(fmt::format(" ({})", symbol.object_name));
     }
 
     auto* item = new QListWidgetItem(name);
@@ -438,14 +437,14 @@ void CodeWidget::UpdateSymbols()
       item->setSelected(true);
 
     // Disable non-function symbols as you can't do anything with them.
-    if (symbol.second.type != Common::Symbol::Type::Function)
+    if (symbol.type != Common::Symbol::Type::Function)
       item->setFlags(Qt::NoItemFlags);
 
-    item->setData(Qt::UserRole, symbol.second.address);
+    item->setData(Qt::UserRole, symbol.address);
 
     if (name.contains(m_symbol_filter, Qt::CaseInsensitive))
       m_symbols_list->addItem(item);
-  }
+  });
 
   m_symbols_list->sortItems();
 }
@@ -457,19 +456,18 @@ void CodeWidget::UpdateNotes()
                                 m_note_list->selectedItems()[0]->text();
   m_note_list->clear();
 
-  for (const auto& note : m_ppc_symbol_db.Notes())
-  {
-    const QString name = QString::fromStdString(note.second.name);
+  m_ppc_symbol_db.ForEachNote([&](const Common::Note& note) {
+    const QString name = QString::fromStdString(note.name);
 
     auto* item = new QListWidgetItem(name);
     if (name == selection)
       item->setSelected(true);
 
-    item->setData(Qt::UserRole, note.second.address);
+    item->setData(Qt::UserRole, note.address);
 
     if (name.toUpper().indexOf(m_symbol_filter.toUpper()) != -1)
       m_note_list->addItem(item);
-  }
+  });
 
   m_note_list->sortItems();
 }