forked from Imagelibrary/binutils-gdb
Replace SYMBOL_*_NAME accessors with member functions
Similar to the MSYMBOL version of this patch, improves readability and will eventually allow making name private. gdb/ChangeLog: 2019-11-22 Christian Biesinger <cbiesinger@google.com> * ada-exp.y: Update. * ada-lang.c (sort_choices): Update. (ada_print_symbol_signature): Update. (resolve_subexp): Update. (ada_parse_renaming): Update. (ada_read_renaming_var_value): Update. (lesseq_defined_than): Update. (remove_extra_symbols): Update. (remove_irrelevant_renamings): Update. (ada_add_block_symbols): Update. (ada_collect_symbol_completion_matches): Update. (ada_is_renaming_symbol): Update. (aggregate_assign_from_choices): Update. (ada_evaluate_subexp): Update. (ada_has_this_exception_support): Update. (ada_is_non_standard_exception_sym): Update. (ada_add_exceptions_from_frame): Update. (ada_add_global_exceptions): Update. (ada_print_subexp): Update. * ax-gdb.c (gen_var_ref): Update. (gen_maybe_namespace_elt): Update. (gen_expr_for_cast): Update. (gen_expr): Update. * block.h: Update. * blockframe.c (find_pc_partial_function): Update. * breakpoint.c (print_breakpoint_location): Update. (update_static_tracepoint): Update. * btrace.c (ftrace_print_function_name): Update. (ftrace_function_switched): Update. * buildsym.c (find_symbol_in_list): Update. * c-exp.y: Update. * c-typeprint.c (c_print_typedef): Update. (c_type_print_template_args): Update. * cli/cli-cmds.c (edit_command): Update. (list_command): Update. (print_sal_location): Update. * coffread.c (patch_opaque_types): Update. (process_coff_symbol): Update. (coff_read_enum_type): Update. * compile/compile-c-symbols.c (c_symbol_substitution_name): Update. (convert_one_symbol): Update. (hash_symname): Update. (eq_symname): Update. * compile/compile-cplus-symbols.c (convert_one_symbol): Update. * compile/compile-cplus-types.c (debug_print_scope): Update. * compile/compile-loc2c.c (do_compile_dwarf_expr_to_c): Update. * compile/compile-object-load.c (get_out_value_type): Update. * cp-namespace.c (cp_scan_for_anonymous_namespaces): Update. (search_symbol_list): Update. (cp_lookup_symbol_imports_or_template): Update. * cp-support.c (overload_list_add_symbol): Update. * ctfread.c (psymtab_to_symtab): Update. * dbxread.c (cp_set_block_scope): Update. * dictionary.c (iter_match_first_hashed): Update. (iter_match_next_hashed): Update. (insert_symbol_hashed): Update. (iter_match_next_linear): Update. * dictionary.h: Update. * dwarf2loc.c (func_get_frame_base_dwarf_block): Update. (locexpr_describe_location_piece): Update. (locexpr_describe_location_1): Update. (locexpr_generate_c_location): Update. (loclist_describe_location): Update. (loclist_generate_c_location): Update. * dwarf2read.c (dw2_debug_names_lookup_symbol): Update. (read_func_scope): Update. (process_enumeration_scope): Update. (new_symbol): Update. (dwarf2_const_value): Update. (dwarf2_symbol_mark_computed): Update. * eval.c (evaluate_funcall): Update. (evaluate_subexp_standard): Update. * expprint.c (print_subexp_standard): Update. (dump_subexp_body_standard): Update. * f-valprint.c (info_common_command_for_block): Update. * findvar.c (get_hosting_frame): Update. (default_read_var_value): Update. * go-lang.c (go_symbol_package_name): Update. * guile/scm-block.c (bkscm_print_block_smob): Update. * guile/scm-symbol.c (syscm_print_symbol_smob): Update. (gdbscm_symbol_name): Update. (gdbscm_symbol_linkage_name): Update. (gdbscm_symbol_print_name): Update. * infcall.c (get_function_name): Update. * infcmd.c (jump_command): Update. (finish_command): Update. * infrun.c (insert_exception_resume_breakpoint): Update. * linespec.c (canonicalize_linespec): Update. (create_sals_line_offset): Update. (convert_linespec_to_sals): Update. (complete_label): Update. (find_label_symbols_in_block): Update. * m2-typeprint.c (m2_print_typedef): Update. * mdebugread.c (mdebug_reg_to_regnum): Update. (parse_symbol): Update. (mylookup_symbol): Update. * mi/mi-cmd-stack.c (list_arg_or_local): Update. (list_args_or_locals): Update. * objc-lang.c (compare_selectors): Update. (info_selectors_command): Update. (compare_classes): Update. (info_classes_command): Update. (find_imps): Update. * p-typeprint.c (pascal_print_typedef): Update. * printcmd.c (build_address_symbolic): Update. (info_address_command): Update. (print_variable_and_value): Update. * python/py-framefilter.c (extract_sym): Update. (py_print_single_arg): Update. * python/py-symbol.c (sympy_str): Update. (sympy_get_name): Update. (sympy_get_linkage_name): Update. * python/python.c (gdbpy_rbreak): Update. * record-btrace.c (btrace_get_bfun_name): Update. (btrace_call_history): Update. * rust-lang.c (rust_print_typedef): Update. * solib-frv.c (frv_fdpic_find_canonical_descriptor): Update. * stabsread.c (stab_reg_to_regnum): Update. (define_symbol): Update. (read_enum_type): Update. (common_block_end): Update. (cleanup_undefined_types_1): Update. (scan_file_globals): Update. * stack.c (print_frame_arg): Update. (print_frame_args): Update. (find_frame_funname): Update. (info_frame_command_core): Update. (iterate_over_block_locals): Update. (print_block_frame_labels): Update. (do_print_variable_and_value): Update. (iterate_over_block_arg_vars): Update. (return_command): Update. * symmisc.c (dump_symtab_1): Update. (print_symbol): Update. * symtab.c (eq_symbol_entry): Update. (symbol_cache_dump): Update. (lookup_language_this): Update. (find_pc_sect_line): Update. (skip_prologue_sal): Update. (symbol_search::compare_search_syms): Update. (treg_matches_sym_type_name): Update. (search_symbols): Update. (print_symbol_info): Update. (rbreak_command): Update. (completion_list_add_symbol): Update. (find_gnu_ifunc): Update. (get_symbol_address): Update. (search_module_symbols): Update. (info_module_subcommand): Update. * symtab.h (SYMBOL_NATURAL_NAME): Remove. (SYMBOL_LINKAGE_NAME): Remove. (SYMBOL_DEMANGLED_NAME): Remove. (SYMBOL_PRINT_NAME): Remove. (SYMBOL_SEARCH_NAME): Remove. * tracepoint.c (set_traceframe_context): Update. (validate_actionline): Update. (collection_list::collect_symbol): Update. (encode_actions_1): Update. (info_scope_command): Update. (print_one_static_tracepoint_marker): Update. * typeprint.c (typedef_hash_table::add_template_parameters): Update. * valops.c (address_of_variable): Update. (find_overload_match): Update. (find_oload_champ): Update. Change-Id: I76bdc8b44eea6876bf03af9d351f8e90cc0154b2
This commit is contained in:
40
gdb/symtab.c
40
gdb/symtab.c
@@ -1151,7 +1151,7 @@ eq_symbol_entry (const struct symbol_cache_slot *slot,
|
||||
}
|
||||
else
|
||||
{
|
||||
slot_name = SYMBOL_SEARCH_NAME (slot->value.found.symbol);
|
||||
slot_name = slot->value.found.symbol->search_name ();
|
||||
slot_domain = SYMBOL_DOMAIN (slot->value.found.symbol);
|
||||
}
|
||||
|
||||
@@ -1168,7 +1168,7 @@ eq_symbol_entry (const struct symbol_cache_slot *slot,
|
||||
/* It's important that we use the same comparison that was done
|
||||
the first time through. If the slot records a found symbol,
|
||||
then this means using the symbol name comparison function of
|
||||
the symbol's language with SYMBOL_SEARCH_NAME. See
|
||||
the symbol's language with symbol->search_name (). See
|
||||
dictionary.c. It also means using symbol_matches_domain for
|
||||
found symbols. See block.c.
|
||||
|
||||
@@ -1517,7 +1517,7 @@ symbol_cache_dump (const struct symbol_cache *cache)
|
||||
|
||||
printf_filtered (" [%4u] = %s, %s %s\n", i,
|
||||
host_address_to_string (context),
|
||||
SYMBOL_PRINT_NAME (found),
|
||||
found->print_name (),
|
||||
domain_name (SYMBOL_DOMAIN (found)));
|
||||
break;
|
||||
}
|
||||
@@ -1950,7 +1950,7 @@ lookup_language_this (const struct language_defn *lang,
|
||||
if (symbol_lookup_debug > 1)
|
||||
{
|
||||
fprintf_unfiltered (gdb_stdlog, " = %s (%s, block %s)\n",
|
||||
SYMBOL_PRINT_NAME (sym),
|
||||
sym->print_name (),
|
||||
host_address_to_string (sym),
|
||||
host_address_to_string (block));
|
||||
}
|
||||
@@ -3136,7 +3136,7 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
|
||||
* but the "break" still works, and the warning is annoying.
|
||||
* So I commented out the warning. RT */
|
||||
/* warning ("In stub for %s; unable to find real function/line info",
|
||||
SYMBOL_LINKAGE_NAME (msymbol)); */
|
||||
msymbol->linkage_name ()); */
|
||||
;
|
||||
/* fall through */
|
||||
else if (BMSYMBOL_VALUE_ADDRESS (mfunsym)
|
||||
@@ -3144,7 +3144,7 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
|
||||
/* Avoid infinite recursion */
|
||||
/* See above comment about why warning is commented out. */
|
||||
/* warning ("In stub for %s; unable to find real function/line info",
|
||||
SYMBOL_LINKAGE_NAME (msymbol)); */
|
||||
msymbol->linkage_name ()); */
|
||||
;
|
||||
/* fall through */
|
||||
else
|
||||
@@ -3715,7 +3715,7 @@ skip_prologue_sal (struct symtab_and_line *sal)
|
||||
objfile = symbol_objfile (sym);
|
||||
pc = BLOCK_ENTRY_PC (SYMBOL_BLOCK_VALUE (sym));
|
||||
section = SYMBOL_OBJ_SECTION (objfile, sym);
|
||||
name = SYMBOL_LINKAGE_NAME (sym);
|
||||
name = sym->linkage_name ();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -4384,8 +4384,7 @@ symbol_search::compare_search_syms (const symbol_search &sym_a,
|
||||
if (sym_a.block != sym_b.block)
|
||||
return sym_a.block - sym_b.block;
|
||||
|
||||
return strcmp (SYMBOL_PRINT_NAME (sym_a.symbol),
|
||||
SYMBOL_PRINT_NAME (sym_b.symbol));
|
||||
return strcmp (sym_a.symbol->print_name (), sym_b.symbol->print_name ());
|
||||
}
|
||||
|
||||
/* Returns true if the type_name of symbol_type of SYM matches TREG.
|
||||
@@ -4402,7 +4401,7 @@ treg_matches_sym_type_name (const compiled_regex &treg,
|
||||
{
|
||||
fprintf_unfiltered (gdb_stdlog,
|
||||
"treg_matches_sym_type_name\n sym %s\n",
|
||||
SYMBOL_NATURAL_NAME (sym));
|
||||
sym->natural_name ());
|
||||
}
|
||||
|
||||
sym_type = SYMBOL_TYPE (sym);
|
||||
@@ -4639,7 +4638,7 @@ search_symbols (const char *regexp, enum search_domain kind,
|
||||
&& file_matches (symtab_to_fullname (real_symtab),
|
||||
files, nfiles, 0)))
|
||||
&& ((!preg.has_value ()
|
||||
|| preg->exec (SYMBOL_NATURAL_NAME (sym), 0,
|
||||
|| preg->exec (sym->natural_name (), 0,
|
||||
NULL, 0) == 0)
|
||||
&& ((kind == VARIABLES_DOMAIN
|
||||
&& SYMBOL_CLASS (sym) != LOC_TYPEDEF
|
||||
@@ -4787,7 +4786,7 @@ print_symbol_info (enum search_domain kind,
|
||||
{
|
||||
type_print (SYMBOL_TYPE (sym),
|
||||
(SYMBOL_CLASS (sym) == LOC_TYPEDEF
|
||||
? "" : SYMBOL_PRINT_NAME (sym)),
|
||||
? "" : sym->print_name ()),
|
||||
gdb_stdout, 0);
|
||||
|
||||
printf_filtered (";\n");
|
||||
@@ -4796,7 +4795,7 @@ print_symbol_info (enum search_domain kind,
|
||||
point we might want a language specific method to print the module
|
||||
symbol so that we can customise the output more. */
|
||||
else if (kind == MODULES_DOMAIN)
|
||||
printf_filtered ("%s\n", SYMBOL_PRINT_NAME (sym));
|
||||
printf_filtered ("%s\n", sym->print_name ());
|
||||
}
|
||||
|
||||
/* This help function for symtab_symbol_info() prints information
|
||||
@@ -5128,7 +5127,7 @@ rbreak_command (const char *regexp, int from_tty)
|
||||
const char *fullname = symtab_to_fullname (symtab);
|
||||
|
||||
string = string_printf ("%s:'%s'", fullname,
|
||||
SYMBOL_LINKAGE_NAME (p.symbol));
|
||||
p.symbol->linkage_name ());
|
||||
break_command (&string[0], from_tty);
|
||||
print_symbol_info (FUNCTIONS_DOMAIN, p.symbol, p.block, NULL);
|
||||
}
|
||||
@@ -5209,7 +5208,7 @@ completion_list_add_symbol (completion_tracker &tracker,
|
||||
const char *text, const char *word)
|
||||
{
|
||||
completion_list_add_name (tracker, SYMBOL_LANGUAGE (sym),
|
||||
SYMBOL_NATURAL_NAME (sym),
|
||||
sym->natural_name (),
|
||||
lookup_name, text, word);
|
||||
}
|
||||
|
||||
@@ -5401,7 +5400,7 @@ find_gnu_ifunc (const symbol *sym)
|
||||
if (SYMBOL_CLASS (sym) != LOC_BLOCK)
|
||||
return {};
|
||||
|
||||
lookup_name_info lookup_name (SYMBOL_SEARCH_NAME (sym),
|
||||
lookup_name_info lookup_name (sym->search_name (),
|
||||
symbol_name_match_type::SEARCH_NAME);
|
||||
struct objfile *objfile = symbol_objfile (sym);
|
||||
|
||||
@@ -6291,7 +6290,7 @@ get_symbol_address (const struct symbol *sym)
|
||||
gdb_assert (sym->maybe_copied);
|
||||
gdb_assert (SYMBOL_CLASS (sym) == LOC_STATIC);
|
||||
|
||||
const char *linkage_name = SYMBOL_LINKAGE_NAME (sym);
|
||||
const char *linkage_name = sym->linkage_name ();
|
||||
|
||||
for (objfile *objfile : current_program_space->objfiles ())
|
||||
{
|
||||
@@ -6372,7 +6371,7 @@ search_module_symbols (const char *module_regexp, const char *regexp,
|
||||
/* This is a module. */
|
||||
gdb_assert (p.symbol != nullptr);
|
||||
|
||||
std::string prefix = SYMBOL_PRINT_NAME (p.symbol);
|
||||
std::string prefix = p.symbol->print_name ();
|
||||
prefix += "::";
|
||||
|
||||
for (const symbol_search &q : symbols)
|
||||
@@ -6380,7 +6379,7 @@ search_module_symbols (const char *module_regexp, const char *regexp,
|
||||
if (q.symbol == nullptr)
|
||||
continue;
|
||||
|
||||
if (strncmp (SYMBOL_PRINT_NAME (q.symbol), prefix.c_str (),
|
||||
if (strncmp (q.symbol->print_name (), prefix.c_str (),
|
||||
prefix.size ()) != 0)
|
||||
continue;
|
||||
|
||||
@@ -6523,8 +6522,7 @@ info_module_subcommand (bool quiet, const char *module_regexp,
|
||||
if (last_module_symbol != p.symbol)
|
||||
{
|
||||
printf_filtered ("\n");
|
||||
printf_filtered (_("Module \"%s\":\n"),
|
||||
SYMBOL_PRINT_NAME (p.symbol));
|
||||
printf_filtered (_("Module \"%s\":\n"), p.symbol->print_name ());
|
||||
last_module_symbol = p.symbol;
|
||||
last_filename = "";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user