Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Use unique_xmalloc_ptr<char> when demangling

Browse Source 
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.
This commit is contained in:
Tom Tromey
2021-10-04 08:44:22 -06:00
parent e133de4984
commit 3456e70c9d
23 changed files with 118 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gdb/go-lang.c
View File

@@ -333,12 +333,9 @@ unpack_mangled_go_symbol (const char *mangled_name,
This demangler can't work in all situations,
thus not too much effort is currently put into it. */
char *
gdb::unique_xmalloc_ptr<char>
go_language::demangle_symbol (const char *mangled_name, int options) const
{
struct obstack tempbuf;
char *result;
char *name_buf;
const char *package_name;
const char *object_name;
const char *method_type_package_name;
@@ -348,15 +345,16 @@ go_language::demangle_symbol (const char *mangled_name, int options) const
if (mangled_name == NULL)
return NULL;
name_buf = unpack_mangled_go_symbol (mangled_name,
&package_name, &object_name,
&method_type_package_name,
&method_type_object_name,
&method_type_is_pointer);
gdb::unique_xmalloc_ptr<char> name_buf
(unpack_mangled_go_symbol (mangled_name,
&package_name, &object_name,
&method_type_package_name,
&method_type_object_name,
&method_type_is_pointer));
if (name_buf == NULL)
return NULL;
obstack_init (&tempbuf);
auto_obstack tempbuf;
/* Print methods as they appear in "method expressions". */
if (method_type_package_name != NULL)
@@ -380,10 +378,7 @@ go_language::demangle_symbol (const char *mangled_name, int options) const
}
obstack_grow_str0 (&tempbuf, "");
result = xstrdup ((const char *) obstack_finish (&tempbuf));
obstack_free (&tempbuf, NULL);
xfree (name_buf);
return result;
return make_unique_xstrdup ((const char *) obstack_finish (&tempbuf));
}
/* Given a Go symbol, return its package or NULL if unknown.