Remove language_demangle

I noticed that language_demangle shadows the global
"current_language".  When I went to fix this, though, I then saw that
language_demangle is only called in two places, and has a comment
saying it should be removed.  This patch removes it.  Note that the
NULL check in language_demangle is not needed by either of the
existing callers.

Regression tested on x86-64 Fedora 36.

Approved-By: Simon Marchi <simon.marchi@efficios.com>

diff --git a/gdb/gdb-demangle.c b/gdb/gdb-demangle.c
index 3af3182572ba7a3bec699715a0a5efd19a6ad8aa..4bcdd981d97d5b0f647719228e6f68a529ca249e 100644 (file)
--- a/gdb/gdb-demangle.c
+++ b/gdb/gdb-demangle.c
@@ -202,7 +202,7 @@ demangle_command (const char *args, int from_tty)
     lang = current_language;
 
   gdb::unique_xmalloc_ptr<char> demangled
-    = language_demangle (lang, name, DMGL_ANSI | DMGL_PARAMS);
+    = lang->demangle_symbol (name, DMGL_ANSI | DMGL_PARAMS);
   if (demangled != NULL)
     gdb_printf ("%s\n", demangled.get ());
   else

diff --git a/gdb/language.c b/gdb/language.c
index 50a53c647f5c9d7302c77575c4c3400d4601a67a..fb065ef6a759b3e95bf7fbafc2253bc57e1bbd12 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -540,21 +540,6 @@ skip_language_trampoline (frame_info_ptr frame, CORE_ADDR pc)
   return 0;
 }
 
-/* Return demangled language symbol, or NULL.
-   FIXME: Options are only useful for certain languages and ignored
-   by others, so it would be better to remove them here and have a
-   more flexible demangler for the languages that need it.
-   FIXME: Sometimes the demangler is invoked when we don't know the
-   language, so we can't use this everywhere.  */
-gdb::unique_xmalloc_ptr<char>
-language_demangle (const struct language_defn *current_language, 
-                               const char *mangled, int options)
-{
-  if (current_language != NULL)
-    return current_language->demangle_symbol (mangled, options);
-  return NULL;
-}
-
 /* Return information about whether TYPE should be passed
    (and returned) by reference at the language level.  */
 

diff --git a/gdb/language.h b/gdb/language.h
index a51ddf973817e6eca2cac63d8821da50f019ce33..57df8acd0a3b537c5f8052bfecdd099096b95f1c 100644 (file)
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -791,11 +791,6 @@ extern const char *language_str (enum language);
 
 extern CORE_ADDR skip_language_trampoline (frame_info_ptr, CORE_ADDR pc);
 
-/* Return demangled language symbol, or NULL.  */
-extern gdb::unique_xmalloc_ptr<char> language_demangle
-     (const struct language_defn *current_language,
-      const char *mangled, int options);
-
 /* Return information about whether TYPE should be passed
    (and returned) by reference at the language level.  */
 struct language_pass_by_ref_info language_pass_by_reference (struct type *type);

diff --git a/gdb/utils.c b/gdb/utils.c
index 4c7d6657b1ffa4cbdb9651ded0722c81f549600f..6ec1cc0d48db88961af7ccbb9634e453dcc9d89c 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1909,7 +1909,7 @@ fprintf_symbol (struct ui_file *stream, const char *name,
       else
        {
          gdb::unique_xmalloc_ptr<char> demangled
-           = language_demangle (language_def (lang), name, arg_mode);
+           = language_def (lang)->demangle_symbol (name, arg_mode);
          gdb_puts (demangled ? demangled.get () : name, stream);
        }
     }