From 40d97ee21fc3e39db73ee8f84b847a22f9d251cc Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 27 May 2022 13:13:41 +0100 Subject: Eliminate the two-level data structures behind location_specs Currently, there's the location_spec hierarchy, and then some location_spec subclasses have their own struct type holding all their data fields. I.e., there is this: location_spec explicit_location_spec linespec_location_spec address_location_spec probe_location_spec and then these separate types: explicit_location linespec_location where: explicit_location_spec has-a explicit_location linespec_location_spec has-a linespec_location This patch eliminates explicit_location and linespec_location, inlining their members in the corresponding location_spec type. The location_spec subclasses were the ones currently defined in location.c, so they are moved to the header. Since the definitions of the classes are now visible, we no longer need location_spec_deleter. Some constructors that are used for cloning location_specs, like: explicit explicit_location_spec (const struct explicit_location *loc) ... were converted to proper copy ctors. In the process, initialize_explicit_location is eliminated, and some functions that returned the "data type behind a locspec", like get_linespec_location are converted to downcast functions, like as_linespec_location_spec. Change-Id: Ia31ccef9382b25a52b00fa878c8df9b8cf2a6c5a --- gdb/mi/mi-cmd-break.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'gdb/mi') diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c index dab0a47..408f582 100644 --- a/gdb/mi/mi-cmd-break.c +++ b/gdb/mi/mi-cmd-break.c @@ -182,7 +182,8 @@ mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc) location_spec_up locspec; const struct breakpoint_ops *ops; int is_explicit = 0; - struct explicit_location explicit_loc; + std::unique_ptr explicit_loc + (new explicit_location_spec ()); std::string extra_string; bool force_condition = false; @@ -220,8 +221,6 @@ mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc) int oind = 0; char *oarg; - initialize_explicit_location (&explicit_loc); - while (1) { int opt = mi_getopt ("-break-insert", argc, argv, @@ -259,19 +258,19 @@ mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc) break; case EXPLICIT_SOURCE_OPT: is_explicit = 1; - explicit_loc.source_filename = oarg; + explicit_loc->source_filename = xstrdup (oarg); break; case EXPLICIT_FUNC_OPT: is_explicit = 1; - explicit_loc.function_name = oarg; + explicit_loc->function_name = xstrdup (oarg); break; case EXPLICIT_LABEL_OPT: is_explicit = 1; - explicit_loc.label_name = oarg; + explicit_loc->label_name = xstrdup (oarg); break; case EXPLICIT_LINE_OPT: is_explicit = 1; - explicit_loc.line_offset = linespec_parse_line_offset (oarg); + explicit_loc->line_offset = linespec_parse_line_offset (oarg); break; case FORCE_CONDITION_OPT: force_condition = true; @@ -339,16 +338,16 @@ mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc) { /* Error check -- we must have one of the other parameters specified. */ - if (explicit_loc.source_filename != NULL - && explicit_loc.function_name == NULL - && explicit_loc.label_name == NULL - && explicit_loc.line_offset.sign == LINE_OFFSET_UNKNOWN) + if (explicit_loc->source_filename != NULL + && explicit_loc->function_name == NULL + && explicit_loc->label_name == NULL + && explicit_loc->line_offset.sign == LINE_OFFSET_UNKNOWN) error (_("-%s-insert: --source option requires --function, --label," " or --line"), dprintf ? "dprintf" : "break"); - explicit_loc.func_name_match_type = match_type; + explicit_loc->func_name_match_type = match_type; - locspec = new_explicit_location_spec (&explicit_loc); + locspec = std::move (explicit_loc); } else { -- cgit v1.1