From: Mark Wielaard <mark@klomp.org>
Date: Fri, 18 Apr 2025 12:53:44 +0000 (+0200)
Subject: Update libiberty demangler
X-Git-Tag: VALGRIND_3_25_0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab770bba01d5585748de8d790e7da36ed9475301;p=thirdparty%2Fvalgrind.git

Update libiberty demangler

Update the libiberty demangler using the auxprogs/update-demangler
script to gcc git commit 94bea5dd6c9a06ddb6244be1e5196ff5fbe2b186.

This update includes:

    * libiberty: Restore build with CP_DEMANGLE_DEBUG defined
    * non-gcc: Remove trailing whitespace
    * libiberty: Fix comment typos
---

diff --git a/auxprogs/update-demangler b/auxprogs/update-demangler
index 9b62fffca..396823975 100755
--- a/auxprogs/update-demangler
+++ b/auxprogs/update-demangler
@@ -17,8 +17,8 @@ set -e
 #---------------------------------------------------------------------
 
 # You need to modify these revision numbers for your update.
-old_gcc_revision=1719fa40c4ee4def60a2ce2f27e17f8168cf28ba # the revision of the previous update
-new_gcc_revision=ca2f7c84927f85b95f0f48f82b93f1460c372db4 # the revision for this update
+old_gcc_revision=ca2f7c84927f85b95f0f48f82b93f1460c372db4 # the revision of the previous update
+new_gcc_revision=94bea5dd6c9a06ddb6244be1e5196ff5fbe2b186 # the revision for this update
 
 # Unless the organization of demangler related files has changed, no
 # changes below this line should be necessary.
diff --git a/coregrind/m_demangle/cp-demangle.c b/coregrind/m_demangle/cp-demangle.c
index b1a8d87e5..a3d1b8810 100644
--- a/coregrind/m_demangle/cp-demangle.c
+++ b/coregrind/m_demangle/cp-demangle.c
@@ -672,9 +672,9 @@ d_dump (struct demangle_component *dc, int indent)
       return;
     case DEMANGLE_COMPONENT_EXTENDED_BUILTIN_TYPE:
       {
-	char suffix[2] = { dc->u.s_extended_builtin.type->suffix, 0 };
+	char suffix[2] = { dc->u.s_extended_builtin.suffix, 0 };
 	printf ("builtin type %s%d%s\n", dc->u.s_extended_builtin.type->name,
-		dc->u.s_extended_builtin.type->arg, suffix);
+		dc->u.s_extended_builtin.arg, suffix);
       }
       return;
     case DEMANGLE_COMPONENT_OPERATOR:
diff --git a/coregrind/m_demangle/demangle.h b/coregrind/m_demangle/demangle.h
index a51815347..8b7dd705a 100644
--- a/coregrind/m_demangle/demangle.h
+++ b/coregrind/m_demangle/demangle.h
@@ -66,14 +66,14 @@ extern "C" {
 /* Disable a limit on the depth of recursion in mangled strings.
    Note if this limit is disabled then stack exhaustion is possible when
    demangling pathologically complicated strings.  Bug reports about stack
-   exhaustion when the option is enabled will be rejected.  */  
-#define DMGL_NO_RECURSE_LIMIT (1 << 18)	
+   exhaustion when the option is enabled will be rejected.  */
+#define DMGL_NO_RECURSE_LIMIT (1 << 18)
 
 /* If DMGL_NO_RECURSE_LIMIT is not enabled, then this is the value used as
    the maximum depth of recursion allowed.  It should be enough for any
    real-world mangled name.  */
 #define DEMANGLE_RECURSION_LIMIT 2048
-  
+
 /* Enumeration of possible demangling styles.
 
    Lucid and ARM styles are still kept logically distinct, even though
diff --git a/coregrind/m_demangle/dyn-string.h b/coregrind/m_demangle/dyn-string.h
index 9052780c9..b0a108d9f 100644
--- a/coregrind/m_demangle/dyn-string.h
+++ b/coregrind/m_demangle/dyn-string.h
@@ -3,7 +3,7 @@
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
 This file is part of GCC.
-   
+
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
diff --git a/coregrind/m_demangle/safe-ctype.h b/coregrind/m_demangle/safe-ctype.h
index fa9c85af4..d3e5214d5 100644
--- a/coregrind/m_demangle/safe-ctype.h
+++ b/coregrind/m_demangle/safe-ctype.h
@@ -122,7 +122,6 @@ extern const unsigned char  _sch_tolower[256];
 #if 0 /* in valgrind */
 #include <ctype.h>
 #endif /* ! in valgrind */
-
 #undef isalpha
 #define isalpha(c) do_not_use_isalpha_with_safe_ctype
 #undef isalnum