X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Flinespec.c;h=964697b7bcbd3f6be276bd500916f1bf06ed0cad;hb=592553c46959c98bf5981ad245d0fbb97f373d2a;hp=ea0d8291dfdf4dca46b3b1a8ac200343969bc811;hpb=7e41c8db84bc6f74843dda40ae443d41977c0d20;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/linespec.c b/gdb/linespec.c index ea0d8291df..964697b7bc 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -1,6 +1,6 @@ /* Parser for linespec for the GNU debugger, GDB. - Copyright (C) 1986-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -77,10 +77,6 @@ enum class linespec_complete_what KEYWORD, }; -/* Typedef for unique_ptrs of vectors of symtabs. */ - -typedef std::unique_ptr> symtab_vector_up; - /* An address entry is used to ensure that any given location is only added to the result a single time. It holds an address and the program space from which the address came. */ @@ -199,7 +195,7 @@ struct collect_info } result; /* Possibly add a symbol to the results. */ - bool add_symbol (block_symbol *bsym); + virtual bool add_symbol (block_symbol *bsym); }; bool @@ -214,6 +210,21 @@ collect_info::add_symbol (block_symbol *bsym) return true; } +/* Custom collect_info for symbol_searcher. */ + +struct symbol_searcher_collect_info + : collect_info +{ + bool add_symbol (block_symbol *bsym) override + { + /* Add everything. */ + this->result.symbols->push_back (*bsym); + + /* Continue iterating. */ + return true; + } +}; + /* Token types */ enum ls_token_type @@ -270,8 +281,18 @@ typedef struct ls_token linespec_token; /* An instance of the linespec parser. */ -struct ls_parser +struct linespec_parser { + linespec_parser (int flags, const struct language_defn *language, + struct program_space *search_pspace, + struct symtab *default_symtab, + int default_line, + struct linespec_result *canonical); + + ~linespec_parser (); + + DISABLE_COPY_AND_ASSIGN (linespec_parser); + /* Lexer internal data */ struct { @@ -284,43 +305,42 @@ struct ls_parser /* The current token. */ linespec_token current; - } lexer; + } lexer {}; /* Is the entire linespec quote-enclosed? */ - int is_quote_enclosed; + int is_quote_enclosed = 0; /* The state of the parse. */ - struct linespec_state state; + struct linespec_state state {}; #define PARSER_STATE(PPTR) (&(PPTR)->state) /* The result of the parse. */ - struct linespec result; + struct linespec result {}; #define PARSER_RESULT(PPTR) (&(PPTR)->result) /* What the parser believes the current word point should complete to. */ - linespec_complete_what complete_what; + linespec_complete_what complete_what = linespec_complete_what::NOTHING; /* The completion word point. The parser advances this as it skips tokens. At some point the input string will end or parsing will fail, and then we attempt completion at the captured completion word point, interpreting the string at completion_word as COMPLETE_WHAT. */ - const char *completion_word; + const char *completion_word = nullptr; /* If the current token was a quoted string, then this is the quoting character (either " or '). */ - int completion_quote_char; + int completion_quote_char = 0; /* If the current token was a quoted string, then this points at the end of the quoted string. */ - const char *completion_quote_end; + const char *completion_quote_end = nullptr; /* If parsing for completion, then this points at the completion tracker. Otherwise, this is NULL. */ - struct completion_tracker *completion_tracker; + struct completion_tracker *completion_tracker = nullptr; }; -typedef struct ls_parser linespec_parser; /* A convenience macro for accessing the explicit location result of the parser. */ @@ -342,7 +362,7 @@ static std::vector decode_objc (struct linespec_state *self, linespec_p ls, const char *arg); -static symtab_vector_up symtabs_from_filename +static std::vector symtabs_from_filename (const char *, struct program_space *pspace); static std::vector *find_label_symbols @@ -374,7 +394,7 @@ static void add_all_symbol_names_from_pspace (struct collect_info *info, struct program_space *pspace, const std::vector &names, enum search_domain search_domain); -static symtab_vector_up +static std::vector collect_symtabs_from_filename (const char *file, struct program_space *pspace); @@ -778,16 +798,16 @@ linespec_lexer_lex_string (linespec_parser *parser) == language_cplus) && (PARSER_STREAM (parser) - start) >= CP_OPERATOR_LEN) { - const char *p = PARSER_STREAM (parser); + const char *op = PARSER_STREAM (parser); - while (p > start && isspace (p[-1])) - p--; - if (p - start >= CP_OPERATOR_LEN) + while (op > start && isspace (op[-1])) + op--; + if (op - start >= CP_OPERATOR_LEN) { - p -= CP_OPERATOR_LEN; - if (strncmp (p, CP_OPERATOR_STR, CP_OPERATOR_LEN) == 0 - && (p == start - || !(isalnum (p[-1]) || p[-1] == '_'))) + op -= CP_OPERATOR_LEN; + if (strncmp (op, CP_OPERATOR_STR, CP_OPERATOR_LEN) == 0 + && (op == start + || !(isalnum (op[-1]) || op[-1] == '_'))) { /* This is an operator name. Keep going. */ ++(PARSER_STREAM (parser)); @@ -798,15 +818,15 @@ linespec_lexer_lex_string (linespec_parser *parser) } } - const char *p = find_parameter_list_end (PARSER_STREAM (parser)); - PARSER_STREAM (parser) = p; + const char *end = find_parameter_list_end (PARSER_STREAM (parser)); + PARSER_STREAM (parser) = end; /* Don't loop around to the normal \0 case above because we don't want to misinterpret a potential keyword at the end of the token when the string isn't "()<>"-balanced. This handles "b function(thread" in completion mode. */ - if (*p == '\0') + if (*end == '\0') { LS_TOKEN_STOKEN (token).ptr = start; LS_TOKEN_STOKEN (token).length @@ -824,9 +844,9 @@ linespec_lexer_lex_string (linespec_parser *parser) == language_cplus) && (PARSER_STREAM (parser) - start) > CP_OPERATOR_LEN) { - const char *p = strstr (start, CP_OPERATOR_STR); + const char *op = strstr (start, CP_OPERATOR_STR); - if (p != NULL && is_operator_name (p)) + if (op != NULL && is_operator_name (op)) { /* This is an operator name. Keep going. */ ++(PARSER_STREAM (parser)); @@ -1110,7 +1130,6 @@ iterate_over_all_matching_symtabs struct program_space *search_pspace, bool include_inline, gdb::function_view callback) { - struct objfile *objfile; struct program_space *pspace; ALL_PSPACES (pspace) @@ -1122,46 +1141,46 @@ iterate_over_all_matching_symtabs set_current_program_space (pspace); - ALL_OBJFILES (objfile) - { - struct compunit_symtab *cu; - - if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching (objfile, - NULL, - lookup_name, - NULL, NULL, - search_domain); - - ALL_OBJFILE_COMPUNITS (objfile, cu) - { - struct symtab *symtab = COMPUNIT_FILETABS (cu); + for (objfile *objfile : all_objfiles (current_program_space)) + { + if (objfile->sf) + objfile->sf->qf->expand_symtabs_matching (objfile, + NULL, + lookup_name, + NULL, NULL, + search_domain); + + for (compunit_symtab *cu : objfile_compunits (objfile)) + { + struct symtab *symtab = COMPUNIT_FILETABS (cu); - iterate_over_file_blocks (symtab, lookup_name, name_domain, callback); + iterate_over_file_blocks (symtab, lookup_name, name_domain, + callback); - if (include_inline) - { - struct block *block; - int i; + if (include_inline) + { + struct block *block; + int i; - for (i = FIRST_LOCAL_BLOCK; - i < BLOCKVECTOR_NBLOCKS (SYMTAB_BLOCKVECTOR (symtab)); - i++) - { - block = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), i); - state->language->la_iterate_over_symbols - (block, lookup_name, name_domain, [&] (block_symbol *bsym) - { - /* Restrict calls to CALLBACK to symbols - representing inline symbols only. */ - if (SYMBOL_INLINED (bsym->symbol)) - return callback (bsym); - return true; - }); - } - } - } - } + for (i = FIRST_LOCAL_BLOCK; + i < BLOCKVECTOR_NBLOCKS (SYMTAB_BLOCKVECTOR (symtab)); + i++) + { + block = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), i); + state->language->la_iterate_over_symbols + (block, lookup_name, name_domain, + [&] (block_symbol *bsym) + { + /* Restrict calls to CALLBACK to symbols + representing inline symbols only. */ + if (SYMBOL_INLINED (bsym->symbol)) + return callback (bsym); + return true; + }); + } + } + } + } } } @@ -1231,17 +1250,6 @@ find_methods (struct type *t, enum language t_lang, const char *name, --method_counter) { const char *method_name = TYPE_FN_FIELDLIST_NAME (t, method_counter); - char dem_opname[64]; - - if (startswith (method_name, "__") || - startswith (method_name, "op") || - startswith (method_name, "type")) - { - if (cplus_demangle_opname (method_name, dem_opname, DMGL_ANSI)) - method_name = dem_opname; - else if (cplus_demangle_opname (method_name, dem_opname, 0)) - method_name = dem_opname; - } if (symbol_name_compare (method_name, lookup_name, NULL)) { @@ -2102,9 +2110,8 @@ create_sals_line_offset (struct linespec_state *self, set_default_source_symtab_and_line (); initialize_defaults (&self->default_symtab, &self->default_line); fullname = symtab_to_fullname (self->default_symtab); - symtab_vector_up r = - collect_symtabs_from_filename (fullname, self->search_pspace); - ls->file_symtabs = r.release (); + *ls->file_symtabs + = collect_symtabs_from_filename (fullname, self->search_pspace); use_default = 1; } @@ -2386,9 +2393,8 @@ convert_explicit_location_to_linespec (struct linespec_state *self, { TRY { - result->file_symtabs - = symtabs_from_filename (source_filename, - self->search_pspace).release (); + *result->file_symtabs + = symtabs_from_filename (source_filename, self->search_pspace); } CATCH (except, RETURN_MASK_ERROR) { @@ -2612,10 +2618,9 @@ parse_linespec (linespec_parser *parser, const char *arg, /* Check if the input is a filename. */ TRY { - symtab_vector_up r + *PARSER_RESULT (parser)->file_symtabs = symtabs_from_filename (user_filename.get (), PARSER_STATE (parser)->search_pspace); - PARSER_RESULT (parser)->file_symtabs = r.release (); } CATCH (ex, RETURN_MASK_ERROR) { @@ -2727,22 +2732,19 @@ linespec_state_constructor (struct linespec_state *self, /* Initialize a new linespec parser. */ -static void -linespec_parser_new (linespec_parser *parser, - int flags, const struct language_defn *language, - struct program_space *search_pspace, - struct symtab *default_symtab, - int default_line, - struct linespec_result *canonical) +linespec_parser::linespec_parser (int flags, + const struct language_defn *language, + struct program_space *search_pspace, + struct symtab *default_symtab, + int default_line, + struct linespec_result *canonical) { - memset (parser, 0, sizeof (linespec_parser)); - parser->lexer.current.type = LSTOKEN_CONSUMED; - memset (PARSER_RESULT (parser), 0, sizeof (struct linespec)); - PARSER_RESULT (parser)->file_symtabs = new std::vector (); - PARSER_EXPLICIT (parser)->func_name_match_type + lexer.current.type = LSTOKEN_CONSUMED; + PARSER_RESULT (this)->file_symtabs = new std::vector (); + PARSER_EXPLICIT (this)->func_name_match_type = symbol_name_match_type::WILD; - PARSER_EXPLICIT (parser)->line_offset.sign = LINE_OFFSET_UNKNOWN; - linespec_state_constructor (PARSER_STATE (parser), flags, language, + PARSER_EXPLICIT (this)->line_offset.sign = LINE_OFFSET_UNKNOWN; + linespec_state_constructor (PARSER_STATE (this), flags, language, search_pspace, default_symtab, default_line, canonical); } @@ -2753,26 +2755,24 @@ static void linespec_state_destructor (struct linespec_state *self) { htab_delete (self->addr_set); + xfree (self->canonical_names); } /* Delete a linespec parser. */ -static void -linespec_parser_delete (void *arg) +linespec_parser::~linespec_parser () { - linespec_parser *parser = (linespec_parser *) arg; + xfree (PARSER_EXPLICIT (this)->source_filename); + xfree (PARSER_EXPLICIT (this)->label_name); + xfree (PARSER_EXPLICIT (this)->function_name); - xfree (PARSER_EXPLICIT (parser)->source_filename); - xfree (PARSER_EXPLICIT (parser)->label_name); - xfree (PARSER_EXPLICIT (parser)->function_name); + delete PARSER_RESULT (this)->file_symtabs; + delete PARSER_RESULT (this)->function_symbols; + delete PARSER_RESULT (this)->minimal_symbols; + delete PARSER_RESULT (this)->labels.label_symbols; + delete PARSER_RESULT (this)->labels.function_symbols; - delete PARSER_RESULT (parser)->file_symtabs; - delete PARSER_RESULT (parser)->function_symbols; - delete PARSER_RESULT (parser)->minimal_symbols; - delete PARSER_RESULT (parser)->labels.label_symbols; - delete PARSER_RESULT (parser)->labels.function_symbols; - - linespec_state_destructor (PARSER_STATE (parser)); + linespec_state_destructor (PARSER_STATE (this)); } /* See description in linespec.h. */ @@ -2780,16 +2780,13 @@ linespec_parser_delete (void *arg) void linespec_lex_to_end (const char **stringp) { - linespec_parser parser; - struct cleanup *cleanup; linespec_token token; const char *orig; if (stringp == NULL || *stringp == NULL) return; - linespec_parser_new (&parser, 0, current_language, NULL, NULL, 0, NULL); - cleanup = make_cleanup (linespec_parser_delete, &parser); + linespec_parser parser (0, current_language, NULL, NULL, 0, NULL); parser.lexer.saved_arg = *stringp; PARSER_STREAM (&parser) = orig = *stringp; @@ -2805,7 +2802,6 @@ linespec_lex_to_end (const char **stringp) while (token.type != LSTOKEN_EOI && token.type != LSTOKEN_KEYWORD); *stringp += PARSER_STREAM (&parser) - orig; - do_cleanups (cleanup); } /* See linespec.h. */ @@ -2931,11 +2927,7 @@ linespec_complete_label (completion_tracker &tracker, symbol_name_match_type func_name_match_type, const char *label_name) { - linespec_parser parser; - struct cleanup *cleanup; - - linespec_parser_new (&parser, 0, language, NULL, NULL, 0, NULL); - cleanup = make_cleanup (linespec_parser_delete, &parser); + linespec_parser parser (0, language, NULL, NULL, 0, NULL); line_offset unknown_offset = { 0, LINE_OFFSET_UNKNOWN }; @@ -2950,14 +2942,11 @@ linespec_complete_label (completion_tracker &tracker, } CATCH (ex, RETURN_MASK_ERROR) { - do_cleanups (cleanup); return; } END_CATCH complete_label (tracker, &parser, label_name); - - do_cleanups (cleanup); } /* See description in linespec.h. */ @@ -2966,12 +2955,9 @@ void linespec_complete (completion_tracker &tracker, const char *text, symbol_name_match_type match_type) { - linespec_parser parser; - struct cleanup *cleanup; const char *orig = text; - linespec_parser_new (&parser, 0, current_language, NULL, NULL, 0, NULL); - cleanup = make_cleanup (linespec_parser_delete, &parser); + linespec_parser parser (0, current_language, NULL, NULL, 0, NULL); parser.lexer.saved_arg = text; PARSER_EXPLICIT (&parser)->func_name_match_type = match_type; PARSER_STREAM (&parser) = text; @@ -3154,8 +3140,6 @@ linespec_complete (completion_tracker &tracker, const char *text, NULL); } } - - do_cleanups (cleanup); } /* A helper function for decode_line_full and decode_line_1 to @@ -3237,9 +3221,7 @@ decode_line_full (const struct event_location *location, int flags, const char *select_mode, const char *filter) { - struct cleanup *cleanups; std::vector filters; - linespec_parser parser; struct linespec_state *state; gdb_assert (canonical != NULL); @@ -3251,10 +3233,9 @@ decode_line_full (const struct event_location *location, int flags, || select_mode == multiple_symbols_cancel); gdb_assert ((flags & DECODE_LINE_LIST_MODE) == 0); - linespec_parser_new (&parser, flags, current_language, - search_pspace, default_symtab, - default_line, canonical); - cleanups = make_cleanup (linespec_parser_delete, &parser); + linespec_parser parser (flags, current_language, + search_pspace, default_symtab, + default_line, canonical); scoped_restore_current_program_space restore_pspace; @@ -3266,16 +3247,11 @@ decode_line_full (const struct event_location *location, int flags, canonical->pre_expanded = 1; /* Arrange for allocated canonical names to be freed. */ - if (!result.empty ()) + std::vector> hold_names; + for (int i = 0; i < result.size (); ++i) { - int i; - - make_cleanup (xfree, state->canonical_names); - for (i = 0; i < result.size (); ++i) - { - gdb_assert (state->canonical_names[i].suffix != NULL); - make_cleanup (xfree, state->canonical_names[i].suffix); - } + gdb_assert (state->canonical_names[i].suffix != NULL); + hold_names.emplace_back (state->canonical_names[i].suffix); } if (select_mode == NULL) @@ -3298,8 +3274,6 @@ decode_line_full (const struct event_location *location, int flags, } else decode_line_2 (state, &result, select_mode); - - do_cleanups (cleanups); } /* See linespec.h. */ @@ -3310,21 +3284,13 @@ decode_line_1 (const struct event_location *location, int flags, struct symtab *default_symtab, int default_line) { - linespec_parser parser; - struct cleanup *cleanups; - - linespec_parser_new (&parser, flags, current_language, - search_pspace, default_symtab, - default_line, NULL); - cleanups = make_cleanup (linespec_parser_delete, &parser); + linespec_parser parser (flags, current_language, + search_pspace, default_symtab, + default_line, NULL); scoped_restore_current_program_space restore_pspace; - std::vector result = event_location_to_sals (&parser, - location); - - do_cleanups (cleanups); - return result; + return event_location_to_sals (&parser, location); } /* See linespec.h. */ @@ -3775,7 +3741,6 @@ class symtab_collector { public: symtab_collector () - : m_symtabs (new std::vector ()) { m_symtab_table = htab_create (1, htab_hash_pointer, htab_eq_pointer, NULL); @@ -3790,15 +3755,15 @@ public: /* Callable as a symbol_found_callback_ftype callback. */ bool operator () (symtab *sym); - /* Releases ownership of the collected symtabs and returns them. */ - symtab_vector_up release_symtabs () + /* Return an rvalue reference to the collected symtabs. */ + std::vector &&release_symtabs () { return std::move (m_symtabs); } private: /* The result vector of symtabs. */ - symtab_vector_up m_symtabs; + std::vector m_symtabs; /* This is used to ensure the symtabs are unique. */ htab_t m_symtab_table; @@ -3813,7 +3778,7 @@ symtab_collector::operator () (struct symtab *symtab) if (!*slot) { *slot = symtab; - m_symtabs->push_back (symtab); + m_symtabs.push_back (symtab); } return false; @@ -3825,7 +3790,7 @@ symtab_collector::operator () (struct symtab *symtab) SEARCH_PSPACE is not NULL, the search is restricted to just that program space. */ -static symtab_vector_up +static std::vector collect_symtabs_from_filename (const char *file, struct program_space *search_pspace) { @@ -3857,14 +3822,14 @@ collect_symtabs_from_filename (const char *file, /* Return all the symtabs associated to the FILENAME. If SEARCH_PSPACE is not NULL, the search is restricted to just that program space. */ -static symtab_vector_up +static std::vector symtabs_from_filename (const char *filename, struct program_space *search_pspace) { - symtab_vector_up result + std::vector result = collect_symtabs_from_filename (filename, search_pspace); - if (result->empty ()) + if (result.empty ()) { if (!have_full_symbols () && !have_partial_symbols ()) throw_error (NOT_FOUND_ERROR, @@ -3876,6 +3841,36 @@ symtabs_from_filename (const char *filename, return result; } +/* See symtab.h. */ + +void +symbol_searcher::find_all_symbols (const std::string &name, + const struct language_defn *language, + enum search_domain search_domain, + std::vector *search_symtabs, + struct program_space *search_pspace) +{ + symbol_searcher_collect_info info; + struct linespec_state state; + + memset (&state, 0, sizeof (state)); + state.language = language; + info.state = &state; + + info.result.symbols = &m_symbols; + info.result.minimal_symbols = &m_minimal_symbols; + std::vector all_symtabs; + if (search_symtabs == nullptr) + { + all_symtabs.push_back (nullptr); + search_symtabs = &all_symtabs; + } + info.file_symtabs = search_symtabs; + + add_matching_symbols_to_info (name.c_str (), symbol_name_match_type::WILD, + search_domain, &info, search_pspace); +} + /* Look up a function symbol named NAME in symtabs FILE_SYMTABS. Matching debug symbols are returned in SYMBOLS. Matching minimal symbols are returned in MINSYMS. */ @@ -4355,8 +4350,6 @@ search_minsyms_for_name (struct collect_info *info, ALL_PSPACES (pspace) { - struct objfile *objfile; - if (search_pspace != NULL && search_pspace != pspace) continue; if (pspace->executing_startup) @@ -4364,17 +4357,17 @@ search_minsyms_for_name (struct collect_info *info, set_current_program_space (pspace); - ALL_OBJFILES (objfile) - { - iterate_over_minimal_symbols (objfile, name, - [&] (struct minimal_symbol *msym) + for (objfile *objfile : all_objfiles (current_program_space)) + { + iterate_over_minimal_symbols (objfile, name, + [&] (struct minimal_symbol *msym) { add_minsym (msym, objfile, nullptr, info->state->list_mode, &minsyms); return false; }); - } + } } } else