yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use unique_xmalloc_ptr in linespec_location_spec

Browse Source 
This changes linespec_location_spec to use unique_xmalloc_ptr,
removing some manual memory management.

Reviewed-By: John Baldwin <jhb@FreeBSD.org>
This commit is contained in:
Tom Tromey 2023-12-10 07:22:07 -07:00
parent 63fc64a8d0
commit e7cdec6605
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/breakpoint.c
View File

@ -8835,7 +8835,8 @@ parse_breakpoint_sals (location_spec *locspec,
if (locspec->type () == LINESPEC_LOCATION_SPEC) if (locspec->type () == LINESPEC_LOCATION_SPEC)
{ {
const char *spec = as_linespec_location_spec (locspec)->spec_string; const char *spec
= as_linespec_location_spec (locspec)->spec_string.get ();
if (spec == NULL) if (spec == NULL)
{ {
@ -8886,7 +8887,7 @@ parse_breakpoint_sals (location_spec *locspec,
const char *spec = NULL; const char *spec = NULL;
if (locspec->type () == LINESPEC_LOCATION_SPEC) if (locspec->type () == LINESPEC_LOCATION_SPEC)
spec = as_linespec_location_spec (locspec)->spec_string; spec = as_linespec_location_spec (locspec)->spec_string.get ();
if (!cursal.symtab if (!cursal.symtab
|| (spec != NULL || (spec != NULL
@ -12474,7 +12475,7 @@ strace_marker_create_sals_from_location_spec (location_spec *locspec,
struct linespec_sals lsal; struct linespec_sals lsal;
const char *arg_start, *arg; const char *arg_start, *arg;
arg = arg_start = as_linespec_location_spec (locspec)->spec_string; arg = arg_start = as_linespec_location_spec (locspec)->spec_string.get ();
lsal.sals = decode_static_tracepoint_spec (&arg); lsal.sals = decode_static_tracepoint_spec (&arg);
std::string str (arg_start, arg - arg_start); std::string str (arg_start, arg - arg_start);
@ -12541,7 +12542,7 @@ std::vector<symtab_and_line>
static_marker_tracepoint::decode_location_spec (location_spec *locspec, static_marker_tracepoint::decode_location_spec (location_spec *locspec,
program_space *search_pspace) program_space *search_pspace)
{ {
const char *s = as_linespec_location_spec (locspec)->spec_string; const char *s = as_linespec_location_spec (locspec)->spec_string.get ();
std::vector<symtab_and_line> sals = decode_static_tracepoint_spec (&s); std::vector<symtab_and_line> sals = decode_static_tracepoint_spec (&s);
if (sals.size () > static_trace_marker_id_idx) if (sals.size () > static_trace_marker_id_idx)

3
gdb/linespec.c
View File

@ -3072,7 +3072,8 @@ location_spec_to_sals (linespec_parser *parser,
{ {
const linespec_location_spec *ls = as_linespec_location_spec (locspec); const linespec_location_spec *ls = as_linespec_location_spec (locspec);
PARSER_STATE (parser)->is_linespec = 1; PARSER_STATE (parser)->is_linespec = 1;
result = parse_linespec (parser, ls->spec_string, ls->match_type); result = parse_linespec (parser, ls->spec_string.get (),
ls->match_type);
} }
break; break;

13
gdb/location.c
View File

@ -83,15 +83,10 @@ linespec_location_spec::linespec_location_spec
breakpoint setting code, where spec_string being nullptr means breakpoint setting code, where spec_string being nullptr means
to use the default breakpoint location. */ to use the default breakpoint location. */
if ((p - orig) > 0) if ((p - orig) > 0)
spec_string = savestring (orig, p - orig); spec_string.reset (savestring (orig, p - orig));
} }
} }
linespec_location_spec::~linespec_location_spec ()
{
xfree (spec_string);
}
location_spec_up location_spec_up
linespec_location_spec::clone () const linespec_location_spec::clone () const
{ {
@ -108,7 +103,7 @@ linespec_location_spec::linespec_location_spec
(const linespec_location_spec &other) (const linespec_location_spec &other)
: location_spec (other), : location_spec (other),
match_type (other.match_type), match_type (other.match_type),
spec_string (maybe_xstrdup (other.spec_string)) spec_string (maybe_xstrdup (other.spec_string.get ()))
{ {
} }
@ -118,9 +113,9 @@ linespec_location_spec::compute_string () const
if (spec_string != nullptr) if (spec_string != nullptr)
{ {
if (match_type == symbol_name_match_type::FULL) if (match_type == symbol_name_match_type::FULL)
return std::string ("-qualified ") + spec_string; return std::string ("-qualified ") + spec_string.get ();
else else
return spec_string; return spec_string.get ();
} }
return {}; return {};
} }

4
gdb/location.h
View File

@ -149,8 +149,6 @@ struct linespec_location_spec : public location_spec
linespec_location_spec (const char **linespec, linespec_location_spec (const char **linespec,
symbol_name_match_type match_type); symbol_name_match_type match_type);
~linespec_location_spec ();
location_spec_up clone () const override; location_spec_up clone () const override;
bool empty_p () const override; bool empty_p () const override;
@ -159,7 +157,7 @@ struct linespec_location_spec : public location_spec
symbol_name_match_type match_type; symbol_name_match_type match_type;
/* The linespec. */ /* The linespec. */
char *spec_string = nullptr; gdb::unique_xmalloc_ptr<char> spec_string;
protected: protected:
linespec_location_spec (const linespec_location_spec &other); linespec_location_spec (const linespec_location_spec &other);