gdb: Rename language_defn::demangle

GDB already has a global symbol `demangle` (a boolean), having a
language method called `demangle` is not a good idea as we often want
to reference `demangle` the control variable inside `demangle` the
member function.

This commit renames `demangle` the member function to
`demangle_symbol`.

There should be no user visible changes after this commit.

gdb/ChangeLog:

	* ada-lang.c (ada_language::demangle): Rename to...
	(ada_language::demangle_symbol): ...this.
	* c-lang.c (cplus_language::demangle): Rename to...
	(cplus_language::demangle_symbol): ...this.
	* d-lang.c (d_language::demangle): Rename to...
	(d_language::demangle_symbol): ...this.
	* f-lang.c (f_language::demangle): Rename to...
	(f_language::demangle_symbol): ...this.
	* go-lang.c (go_language::demangle): Rename to...
	(go_language::demangle_symbol): ...this.
	* language.c (language_demangle): Update call to demangle_symbol.
	(auto_or_unknown_language::demangle): Rename to...
	(auto_or_unknown_language::demangle_symbol): ...this.
	* language.h (language_defn::demangle): Rename to...
	(language_defn::demangle_symbol): ...this.
	* objc-lang.c (objc_language::demangle): Rename to...
	(objc_language::demangle_symbol): ...this.
	* rust-lang.c (rust_language::demangle): Rename to...
	(rust_language::demangle_symbol): ...this.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index daa228dd6ab1826a0a6694f8dd2e92b1a1d44bd2..1a4a03cd34c156484179b71d2ceddb12cff4f3cf 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,25 @@
+2020-10-23  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * ada-lang.c (ada_language::demangle): Rename to...
+       (ada_language::demangle_symbol): ...this.
+       * c-lang.c (cplus_language::demangle): Rename to...
+       (cplus_language::demangle_symbol): ...this.
+       * d-lang.c (d_language::demangle): Rename to...
+       (d_language::demangle_symbol): ...this.
+       * f-lang.c (f_language::demangle): Rename to...
+       (f_language::demangle_symbol): ...this.
+       * go-lang.c (go_language::demangle): Rename to...
+       (go_language::demangle_symbol): ...this.
+       * language.c (language_demangle): Update call to demangle_symbol.
+       (auto_or_unknown_language::demangle): Rename to...
+       (auto_or_unknown_language::demangle_symbol): ...this.
+       * language.h (language_defn::demangle): Rename to...
+       (language_defn::demangle_symbol): ...this.
+       * objc-lang.c (objc_language::demangle): Rename to...
+       (objc_language::demangle_symbol): ...this.
+       * rust-lang.c (rust_language::demangle): Rename to...
+       (rust_language::demangle_symbol): ...this.
+
 2020-10-23  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * language.h (LA_ITERATE_OVER_SYMBOLS): Delete.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 3a74de15bf6857880dc5ec9e4f7a5c1f9d86b459..0a5b93f5e29a149130edb26afc85fafd051741b3 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13869,7 +13869,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
     return ada_la_decode (mangled, options);
   }

diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 4e942435177b0989585ae70544f3189397ce78ff..329986ce88c737121d7d4d95cf7bc768f977dd42 100644 (file)
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -1120,7 +1120,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
     return gdb_demangle (mangled, options);
   }

diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index f9f1a66c3c21d34fee0c8aafee13392a7b8eeeea..2537f046c16cd55c6eb1b768b35538dcbed248df 100644 (file)
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -225,7 +225,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
     return d_demangle (mangled, options);
   }

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index f7c54b462a49ae9888ee42e2b4cb0d83223116bb..9089166665e8a6dc99308abcef64056b7fc24674 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -787,7 +787,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
       /* We could support demangling here to provide module namespaces
         also for inferiors with only minimal symbol table (ELF symbols).

diff --git a/gdb/go-lang.c b/gdb/go-lang.c
index 0322961179f211cd92157afddf2ad60e10fe69e2..01cd3a47690b000f5b65149f1d33444304ab5cd2 100644 (file)
--- a/gdb/go-lang.c
+++ b/gdb/go-lang.c
@@ -586,7 +586,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
     return go_demangle (mangled, options);
   }

diff --git a/gdb/language.c b/gdb/language.c
index 4053cb76885900ddaa14964786061d3bc23c2479..fe093789af8996f50c93724649af3b99db4ef21a 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -589,7 +589,7 @@ language_demangle (const struct language_defn *current_language,
                                const char *mangled, int options)
 {
   if (current_language != NULL)
-    return current_language->demangle (mangled, options);
+    return current_language->demangle_symbol (mangled, options);
   return NULL;
 }
 
@@ -815,7 +815,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
     /* The auto language just uses the C++ demangler.  */
     return gdb_demangle (mangled, options);

diff --git a/gdb/language.h b/gdb/language.h
index 9d64a4ae8e92268ff6a145e69bddba80f4a4ae07..106d7667527874115aeb0ed8b52b596211794b6c 100644 (file)
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -328,7 +328,7 @@ struct language_defn
   }
 
   /* Return demangled language symbol version of MANGLED, or NULL.  */
-  virtual char *demangle (const char *mangled, int options) const
+  virtual char *demangle_symbol (const char *mangled, int options) const
   {
     return nullptr;
   }

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 009b7a7331eebdce5fa27d002fad80277af0654c..16751464c67d1930c24529ed74777b5b6e406e42 100644 (file)
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -363,7 +363,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
     return objc_demangle (mangled, options);
   }

diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index 86e7289c5e6c81a2ce2bbeaea68f457e02174784..5edf4aad0fd507e03507a0d29315114b0134151c 100644 (file)
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -1972,7 +1972,7 @@ public:
 
   /* See language.h.  */
 
-  char *demangle (const char *mangled, int options) const override
+  char *demangle_symbol (const char *mangled, int options) const override
   {
     return gdb_demangle (mangled, options);
   }