diff options
| author | Tom Tromey <tromey@adacore.com> | 2021-10-04 08:44:22 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2021-10-04 13:45:38 -0600 |
| commit | 3456e70c9d69da8d62a0ea1f8c2e643648afc654 (patch) | |
| tree | 7959a8dc460685d2e8e3197478eddb4430d48708 /gdb/ada-lang.c | |
| parent | e133de4984cef9acb32fd756c607aa2fa1d090fb (diff) | |
| download | binutils-3456e70c9d69da8d62a0ea1f8c2e643648afc654.zip binutils-3456e70c9d69da8d62a0ea1f8c2e643648afc654.tar.gz binutils-3456e70c9d69da8d62a0ea1f8c2e643648afc654.tar.bz2 | |
Use unique_xmalloc_ptr<char> when demangling
I noticed that some methods in language_defn could use
unique_xmalloc_ptr<char> rather than a plain 'char *'. This patch
implements this change, fixing up the fallout and changing
gdb_demangle to also return this type. In one spot, std::string is
used to simplify some related code, and in another, an auto_obstack is
used to avoid manual management.
Regression tested on x86-64 Fedora 34.
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 1a3ce36..3b7c10f 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -1324,12 +1324,6 @@ ada_decode_symbol (const struct general_symbol_info *arg) return *resultp; } -static char * -ada_la_decode (const char *encoded, int options) -{ - return xstrdup (ada_decode (encoded).c_str ()); -} - /* Arrays */ @@ -13116,8 +13110,9 @@ public: } /* See language.h. */ - bool sniff_from_mangled_name (const char *mangled, - char **out) const override + bool sniff_from_mangled_name + (const char *mangled, + gdb::unique_xmalloc_ptr<char> *out) const override { std::string demangled = ada_decode (mangled); @@ -13155,9 +13150,10 @@ public: /* See language.h. */ - char *demangle_symbol (const char *mangled, int options) const override + gdb::unique_xmalloc_ptr<char> demangle_symbol (const char *mangled, + int options) const override { - return ada_la_decode (mangled, options); + return make_unique_xstrdup (ada_decode (mangled).c_str ()); } /* See language.h. */ |