Core: Implement automatic symbol demangling

1 files changed, 5 insertions, 0 deletions

diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp
index 2fa514ba86..e1778d2ca5 100644
--- a/Source/Core/Common/SymbolDB.cpp
+++ b/Source/Core/Common/SymbolDB.cpp
@@ -9,6 +9,7 @@
 #include <string>
 #include <utility>
 
+#include "Common/CWDemangler.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 
@@ -31,6 +32,10 @@ void Symbol::Rename(const std::string& symbol_name)
 {
   this->name = symbol_name;
   this->function_name = GetStrippedFunctionName(symbol_name);
+
+  // Try demangling the symbol name, saving it in the symbol if valid.
+  auto demangle_result = CWDemangler::demangle(symbol_name, CWDemangler::DemangleOptions());
+  this->demangled_name = demangle_result.value_or("");
 }
 
 void SymbolDB::List()