From 9b35dee6ecabc8e92294c2072f66676fff8b1046 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Fri, 9 May 2025 17:03:13 -0400
Subject: Don't query the template simplifier setting while demangling symbols

---
 view/elf/elfview.cpp     | 3 +--
 view/macho/machoview.cpp | 7 +------
 view/pe/coffview.cpp     | 3 +--
 view/pe/peview.cpp       | 3 +--
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/view/elf/elfview.cpp b/view/elf/elfview.cpp
index bb193495..1a8aeea6 100644
--- a/view/elf/elfview.cpp
+++ b/view/elf/elfview.cpp
@@ -2531,8 +2531,7 @@ void ElfView::DefineElfSymbol(BNSymbolType type, const string& incomingName, uin
 		{
 			QualifiedName demangledName;
 			Ref<Type> demangledType;
-			bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", this);
-			if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, this, simplify))
+			if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, this, m_simplifyTemplates))
 			{
 				shortName = demangledName.GetString();
 				fullName = shortName;
diff --git a/view/macho/machoview.cpp b/view/macho/machoview.cpp
index a550efea..b832e1e5 100644
--- a/view/macho/machoview.cpp
+++ b/view/macho/machoview.cpp
@@ -2432,8 +2432,7 @@ Ref<Symbol> MachoView::DefineMachoSymbol(
 		{
 			QualifiedName demangledName;
 			Ref<Type> demangledType;
-			bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", this);
-			if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, this, simplify))
+			if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, nullptr, m_simplifyTemplates))
 			{
 				shortName = demangledName.GetString();
 				fullName = shortName;
@@ -2442,10 +2441,6 @@ Ref<Symbol> MachoView::DefineMachoSymbol(
 				if (!typeRef && m_extractMangledTypes && !GetDefaultPlatform()->GetFunctionByName(rawName))
 					typeRef = demangledType;
 			}
-			else
-			{
-				m_logger->LogDebug("Failed to demangle name: '%s'\n", rawName.c_str());
-			}
 		}
 
 		return std::pair<Ref<Symbol>, Ref<Type>>(
diff --git a/view/pe/coffview.cpp b/view/pe/coffview.cpp
index 54d72f92..6fb216e1 100644
--- a/view/pe/coffview.cpp
+++ b/view/pe/coffview.cpp
@@ -1531,8 +1531,7 @@ void COFFView::AddCOFFSymbol(BNSymbolType type, const string& dll, const string&
 	{
 		QualifiedName demangledName;
 		Ref<Type> demangledType;
-		bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", this);
-		if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, this, simplify))
+		if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, nullptr, m_simplifyTemplates))
 		{
 			shortName = demangledName.GetString();
 			fullName = shortName;
diff --git a/view/pe/peview.cpp b/view/pe/peview.cpp
index 96103155..6c852bca 100644
--- a/view/pe/peview.cpp
+++ b/view/pe/peview.cpp
@@ -2980,8 +2980,7 @@ void PEView::AddPESymbol(BNSymbolType type, const string& dll, const string& nam
 			{
 				QualifiedName demangledName;
 				Ref<Type> demangledType;
-				bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", this);
-				if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, this, simplify))
+				if (DemangleGeneric(m_arch, rawName, demangledType, demangledName, nullptr, m_simplifyTemplates))
 				{
 					shortName = demangledName.GetString();
 					fullName = shortName;
-- 
cgit v1.3.1