OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb: make macro_stringify return a gdb::unique_xmalloc_ptr<char> 

The change to macro_stringify is straightforward.  This allows removing
the manual memory management in fixup_definition.

gdb/ChangeLog:

	* macroexp.h (macro_stringify): Return
	gdb::unique_xmalloc_ptr<char>.
	* macroexp.c (macro_stringify): Likewise.
	* macrotab.c (fixup_definition): Update.

Change-Id: Id7db8988bdbd569dd51c4f4655b00eb26db277cb
This commit is contained in:
Simon Marchi 2020-07-02 20:38:53 -04:00
parent 14d960c82a
commit a36158ec0c
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2020-07-02 Simon Marchi <simon.marchi@polymtl.ca>
* macroexp.h (macro_stringify): Return
gdb::unique_xmalloc_ptr<char>.
* macroexp.c (macro_stringify): Likewise.
* macrotab.c (fixup_definition): Update.
2020-07-02 Simon Marchi <simon.marchi@polymtl.ca> 2020-07-02 Simon Marchi <simon.marchi@polymtl.ca>
* c-exp.y (scan_macro_expansion): Don't free `expansion`. * c-exp.y (scan_macro_expansion): Don't free `expansion`.

4
gdb/macroexp.c
View File

@ -698,7 +698,7 @@ stringify (struct macro_buffer *dest, const char *arg, int len)
/* See macroexp.h. */ /* See macroexp.h. */
char * gdb::unique_xmalloc_ptr<char>
macro_stringify (const char *str) macro_stringify (const char *str)
{ {
int len = strlen (str); int len = strlen (str);
@ -707,7 +707,7 @@ macro_stringify (const char *str)
stringify (&buffer, str, len); stringify (&buffer, str, len);
buffer.appendc ('\0'); buffer.appendc ('\0');
return buffer.release ().release (); return buffer.release ();
} }

6
gdb/macroexp.h
View File

@ -78,9 +78,7 @@ int macro_is_identifier_nondigit (int c);
int macro_is_digit (int c); int macro_is_digit (int c);
/* Stringify STR according to C rules and return an xmalloc'd pointer /* Stringify STR according to C rules and return a null-terminated string. */
to the result. */ gdb::unique_xmalloc_ptr<char> macro_stringify (const char *str);
char *macro_stringify (const char *str);
#endif /* MACROEXP_H */ #endif /* MACROEXP_H */

14
gdb/macrotab.c
View File

@ -882,25 +882,19 @@ macro_undef (struct macro_source_file *source, int line,
static struct macro_definition * static struct macro_definition *
fixup_definition (const char *filename, int line, struct macro_definition *def) fixup_definition (const char *filename, int line, struct macro_definition *def)
{ {
static char *saved_expansion; static gdb::unique_xmalloc_ptr<char> saved_expansion;
if (saved_expansion)
{
xfree (saved_expansion);
saved_expansion = NULL;
}
if (def->kind == macro_object_like) if (def->kind == macro_object_like)
{ {
if (def->argc == macro_FILE) if (def->argc == macro_FILE)
{ {
saved_expansion = macro_stringify (filename); saved_expansion = macro_stringify (filename);
def->replacement = saved_expansion; def->replacement = saved_expansion.get ();
} }
else if (def->argc == macro_LINE) else if (def->argc == macro_LINE)
{ {
saved_expansion = xstrprintf ("%d", line); saved_expansion.reset (xstrprintf ("%d", line));
def->replacement = saved_expansion; def->replacement = saved_expansion.get ();
} }
} }