FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change linespec_result::location to be an event_location_up

Browse source 
This is a follow-up to another patch.  It changes
linespec_result::location to be an event_location_up.

gdb/ChangeLog
2017-04-12  Tom Tromey  <tom@tromey.com>

	* probe.c (parse_probes): Update.
	* location.h (delete_event_location): Don't declare.
	(event_location_deleter::operator()): Update.
	* location.c (event_location_deleter::operator()): Rename from
	delete_event_location.
	* linespec.h (linespec_result) <location>: Change type to
	event_location_up.
	* linespec.c (canonicalize_linespec, event_location_to_sals)
	(decode_objc): Update.
	(linespec_result): Don't call delete_event_location.
	* breakpoint.c (create_breakpoints_sal)
	(bkpt_probe_create_sals_from_location)
	(strace_marker_create_sals_from_location): Update.
This commit is contained in:
Tom Tromey 2017-04-10 15:53:22 -06:00
parent 16e802b9c0
commit 8e9e35b180
7 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gdb/ChangeLog
View file

@ -1,3 +1,19 @@
2017-04-12 Tom Tromey <tom@tromey.com>
* probe.c (parse_probes): Update.
* location.h (delete_event_location): Don't declare.
(event_location_deleter::operator()): Update.
* location.c (event_location_deleter::operator()): Rename from
delete_event_location.
* linespec.h (linespec_result) <location>: Change type to
event_location_up.
* linespec.c (canonicalize_linespec, event_location_to_sals)
(decode_objc): Update.
(linespec_result): Don't call delete_event_location.
* breakpoint.c (create_breakpoints_sal)
(bkpt_probe_create_sals_from_location)
(strace_marker_create_sals_from_location): Update.
2017-04-12 Tom Tromey <tom@tromey.com> 2017-04-12 Tom Tromey <tom@tromey.com>
* linespec.h (struct linespec_result): Add constructor and * linespec.h (struct linespec_result): Add constructor and

12
gdb/breakpoint.c
View file

@ -9429,7 +9429,7 @@ create_breakpoints_sal (struct gdbarch *gdbarch,
'break', without arguments. */ 'break', without arguments. */
event_location_up location event_location_up location
= (canonical->location != NULL = (canonical->location != NULL
? copy_event_location (canonical->location) : NULL); ? copy_event_location (canonical->location.get ()) : NULL);
char *filter_string = lsal->canonical ? xstrdup (lsal->canonical) : NULL; char *filter_string = lsal->canonical ? xstrdup (lsal->canonical) : NULL;
make_cleanup (xfree, filter_string); make_cleanup (xfree, filter_string);
@ -13390,7 +13390,8 @@ bkpt_probe_create_sals_from_location (const struct event_location *location,
struct linespec_sals lsal; struct linespec_sals lsal;
lsal.sals = parse_probes (location, NULL, canonical); lsal.sals = parse_probes (location, NULL, canonical);
lsal.canonical = xstrdup (event_location_to_string (canonical->location)); lsal.canonical
= xstrdup (event_location_to_string (canonical->location.get ()));
VEC_safe_push (linespec_sals, canonical->sals, &lsal); VEC_safe_push (linespec_sals, canonical->sals, &lsal);
} }
@ -13646,10 +13647,11 @@ strace_marker_create_sals_from_location (const struct event_location *location,
str = savestring (arg_start, arg - arg_start); str = savestring (arg_start, arg - arg_start);
cleanup = make_cleanup (xfree, str); cleanup = make_cleanup (xfree, str);
canonical->location = new_linespec_location (&str).release (); canonical->location = new_linespec_location (&str);
do_cleanups (cleanup); do_cleanups (cleanup);
lsal.canonical = xstrdup (event_location_to_string (canonical->location)); lsal.canonical
= xstrdup (event_location_to_string (canonical->location.get ()));
VEC_safe_push (linespec_sals, canonical->sals, &lsal); VEC_safe_push (linespec_sals, canonical->sals, &lsal);
} }
@ -13686,7 +13688,7 @@ strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch,
expanded.nelts = 1; expanded.nelts = 1;
expanded.sals = &lsal->sals.sals[i]; expanded.sals = &lsal->sals.sals[i];
location = copy_event_location (canonical->location); location = copy_event_location (canonical->location.get ());
tp = new tracepoint (); tp = new tracepoint ();
init_breakpoint_sal (&tp->base, gdbarch, expanded, init_breakpoint_sal (&tp->base, gdbarch, expanded,

10
gdb/linespec.c
View file

@ -1750,8 +1750,9 @@ canonicalize_linespec (struct linespec_state *state, const linespec_p ls)
return; return;
/* Save everything as an explicit location. */ /* Save everything as an explicit location. */
canon = state->canonical->location state->canonical->location
= new_explicit_location (&ls->explicit_loc).release (); = new_explicit_location (&ls->explicit_loc);
canon = state->canonical->location.get ();
explicit_loc = get_explicit_location (canon); explicit_loc = get_explicit_location (canon);
if (explicit_loc->label_name != NULL) if (explicit_loc->label_name != NULL)
@ -2491,7 +2492,7 @@ event_location_to_sals (linespec_parser *parser,
addr = linespec_expression_to_pc (&const_expr); addr = linespec_expression_to_pc (&const_expr);
if (PARSER_STATE (parser)->canonical != NULL) if (PARSER_STATE (parser)->canonical != NULL)
PARSER_STATE (parser)->canonical->location PARSER_STATE (parser)->canonical->location
= copy_event_location (location).release (); = copy_event_location (location);
do_cleanups (cleanup); do_cleanups (cleanup);
} }
@ -2780,7 +2781,7 @@ decode_objc (struct linespec_state *self, linespec_p ls, const char *arg)
str = xstrdup (saved_arg); str = xstrdup (saved_arg);
make_cleanup (xfree, str); make_cleanup (xfree, str);
self->canonical->location = new_linespec_location (&str).release (); self->canonical->location = new_linespec_location (&str);
} }
} }
@ -3892,7 +3893,6 @@ linespec_result::~linespec_result ()
int i; int i;
struct linespec_sals *lsal; struct linespec_sals *lsal;
delete_event_location (location);
for (i = 0; VEC_iterate (linespec_sals, sals, i, lsal); ++i) for (i = 0; VEC_iterate (linespec_sals, sals, i, lsal); ++i)
{ {
xfree (lsal->canonical); xfree (lsal->canonical);

6
gdb/linespec.h
View file

@ -19,6 +19,7 @@
struct symtab; struct symtab;
#include "location.h"
#include "vec.h" #include "vec.h"
/* Flags to pass to decode_line_1 and decode_line_full. */ /* Flags to pass to decode_line_1 and decode_line_full. */
@ -61,7 +62,6 @@ struct linespec_result
linespec_result () linespec_result ()
: special_display (0), : special_display (0),
pre_expanded (0), pre_expanded (0),
location (NULL),
sals (NULL) sals (NULL)
{ {
} }
@ -83,8 +83,8 @@ struct linespec_result
int pre_expanded; int pre_expanded;
/* If PRE_EXPANDED is non-zero, this is set to the location entered /* If PRE_EXPANDED is non-zero, this is set to the location entered
by the user. This will be freed by destroy_linespec_result. */ by the user. */
struct event_location *location; event_location_up location;
/* The sals. The vector will be freed by the destructor. */ /* The sals. The vector will be freed by the destructor. */
VEC (linespec_sals) *sals; VEC (linespec_sals) *sals;

4
gdb/location.c
View file

@ -342,10 +342,8 @@ copy_event_location (const struct event_location *src)
return event_location_up (dst); return event_location_up (dst);
} }
/* See description in location.h. */
void void
delete_event_location (struct event_location *location) event_location_deleter::operator() (event_location *location) const
{ {
if (location != NULL) if (location != NULL)
{ {

9
gdb/location.h
View file

@ -114,18 +114,11 @@ extern char *
extern const char * extern const char *
event_location_to_string (struct event_location *location); event_location_to_string (struct event_location *location);
/* Free an event location and any associated data. */
extern void delete_event_location (struct event_location *location);
/* A deleter for a struct event_location. */ /* A deleter for a struct event_location. */
struct event_location_deleter struct event_location_deleter
{ {
void operator() (event_location *location) const void operator() (event_location *location) const;
{
delete_event_location (location);
}
}; };
/* A unique pointer for event_location. */ /* A unique pointer for event_location. */

2
gdb/probe.c
View file

@ -205,7 +205,7 @@ parse_probes (const struct event_location *location,
make_cleanup (xfree, canon); make_cleanup (xfree, canon);
canonical->special_display = 1; canonical->special_display = 1;
canonical->pre_expanded = 1; canonical->pre_expanded = 1;
canonical->location = new_probe_location (canon).release (); canonical->location = new_probe_location (canon);
} }
do_cleanups (cleanup); do_cleanups (cleanup);