GNU3 demangler: fix two bugs, remove dead code, guard debug helpers

- Fix DemangleBaseUnresolvedName: consume 'on' prefix before reading operator chars
- Fix PeekString(32) in Intel Vector ABI z/Z disambiguation: use min(32, Length())
- Remove unused NextIsOneOf and ReadUntil Reader methods
- Guard GetRaw, GetTemplateType, and PrintTables behind GNUDEMANGLE_DEBUG

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: plafosse

demangler/gnu3/demangle_gnu3.cpp

@@ -261,22 +261,12 @@ string DemangleGNU3Reader::PeekString(size_t count)
 
 
 
-bool DemangleGNU3Reader::NextIsOneOf(const string& list)
-{
-	char elm = Peek();
-	for (auto a : list)
-	{
-		if (a == elm)
-			return true;
-	}
-	return false;
-}
-
-
+#ifdef GNUDEMANGLE_DEBUG
 string DemangleGNU3Reader::GetRaw()
 {
 	return m_data.substr(m_offset);
 }
+#endif
 
 
 
@@ -291,14 +281,6 @@ string DemangleGNU3Reader::ReadString(size_t count)
 }
 
 
-string DemangleGNU3Reader::ReadUntil(char sentinal)
-{
-	size_t pos = m_data.find_first_of(sentinal, m_offset);
-	if (pos == string::npos)
-		throw DemangleException();
-	return ReadString(pos);
-}
-
 
 
 // ===== DemangleGNU3 implementation =====
@@ -371,12 +353,14 @@ void DemangleGNU3::PushTemplateType(const DemangledTypeNode& type)
 }
 
 
+#ifdef GNUDEMANGLE_DEBUG
 const DemangledTypeNode& DemangleGNU3::GetTemplateType(size_t ref)
 {
 	if (ref >= m_templateSubstitute.size())
 		throw DemangleException();
 	return m_templateSubstitute[ref];
 }
+#endif
 
 
 void DemangleGNU3::PushType(const DemangledTypeNode& type)
@@ -393,6 +377,7 @@ const DemangledTypeNode& DemangleGNU3::GetType(size_t ref)
 }
 
 
+#ifdef GNUDEMANGLE_DEBUG
 void DemangleGNU3::PrintTables()
 {
 	LogDebug("Substitution Table\n");
@@ -407,6 +392,7 @@ void DemangleGNU3::PrintTables()
 		LogDebug("[%d] %s\n", i-1, GetTemplateType(i).GetString().c_str());
 	}
 }
+#endif
 
 
 void DemangleGNU3::DemangleCVQualifiers(bool& cnst, bool& vltl, bool& rstrct)
@@ -1440,6 +1426,7 @@ QualifiedName DemangleGNU3::DemangleBaseUnresolvedName()
 		const string str = m_reader.PeekString(2);
 		if (str == "on")
 		{
+			m_reader.Consume(); m_reader.Consume(); // skip 'o','n' prefix
 			out.push_back(GetOperator(m_reader.Read(), m_reader.Read()));
 			if (m_reader.Peek() == 'I')
 			{
@@ -2418,7 +2405,7 @@ DemangledTypeNode DemangleGNU3::DemangleSymbol(QualifiedName& varName)
 			// that don't appear in valid vparameter sequences.
 			if (!isVectorABI && (peekChar == 'z' || peekChar == 'Z'))
 			{
-				_STD_STRING ahead = m_reader.PeekString(32);
+				_STD_STRING ahead = m_reader.PeekString(std::min((size_t)32, m_reader.Length()));
 				if (ahead.size() >= 3 && (ahead[1] == 'M' || ahead[1] == 'N'))
 				{
 					size_t pos = 2;

demangler/gnu3/demangle_gnu3.h

@@ -52,10 +52,10 @@ class DemangleGNU3Reader
 	DemangleGNU3Reader(const _STD_STRING& data);
 	void Reset(const _STD_STRING& data);
 	_STD_STRING PeekString(size_t count=1);
-	bool NextIsOneOf(const _STD_STRING& list);
+#ifdef GNUDEMANGLE_DEBUG
 	_STD_STRING GetRaw();
+#endif
 	_STD_STRING ReadString(size_t count=1);
-	_STD_STRING ReadUntil(char sentinal);
 
 	size_t Length() const { return m_data.length() - m_offset; }
 
@@ -148,20 +148,23 @@ class DemangleGNU3
 	int64_t DemangleNumber();
 	DemangledTypeNode DemangleNestedName(bool* allTypeTemplateArgs = nullptr);
 	void PushTemplateType(const DemangledTypeNode& type);
-	const DemangledTypeNode& GetTemplateType(size_t ref);
 	void PushType(const DemangledTypeNode& type);
 	const DemangledTypeNode& GetType(size_t ref);
 
 	DemangledTypeNode CreateUnknownType(const BN::QualifiedName& s);
 	DemangledTypeNode CreateUnknownType(const _STD_STRING& s);
 	static void ExtendTypeName(DemangledTypeNode& type, const _STD_STRING& extend);
 
+#ifdef GNUDEMANGLE_DEBUG
+	const DemangledTypeNode& GetTemplateType(size_t ref);
+	void PrintTables();
+#endif
+
 public:
 	DemangleGNU3(BN::Architecture* arch, const _STD_STRING& mangledName);
 	void Reset(BN::Architecture* arch, const _STD_STRING& mangledName);
 	DemangledTypeNode DemangleSymbol(BN::QualifiedName& varName);
 	BN::QualifiedName GetVarName() const { return m_varName; }
-	void PrintTables();
 };