From: Andrew Burgess Date: Sat, 19 Sep 2020 19:38:11 +0000 (+0100) Subject: gdb: Rename language_defn::demangle X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5399db93c53472a9b41ce6c8df00791b1ca31247;p=binutils-gdb.git 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 daa228dd6ab..1a4a03cd34c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,25 @@ +2020-10-23 Andrew Burgess + + * 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 * language.h (LA_ITERATE_OVER_SYMBOLS): Delete. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 3a74de15bf6..0a5b93f5e29 100644 --- 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 4e942435177..329986ce88c 100644 --- 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 f9f1a66c3c2..2537f046c16 100644 --- 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 f7c54b462a4..9089166665e 100644 --- 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 0322961179f..01cd3a47690 100644 --- 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 4053cb76885..fe093789af8 100644 --- 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 9d64a4ae8e9..106d7667527 100644 --- 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 009b7a7331e..16751464c67 100644 --- 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 86e7289c5e6..5edf4aad0fd 100644 --- 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); }