mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 09:08:59 +00:00
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:
31
gdb/stack.c
31
gdb/stack.c
@@ -427,7 +427,7 @@ print_frame_arg (const frame_print_options &fp_opts,
|
||||
|
||||
annotate_arg_emitter arg_emitter;
|
||||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||||
fprintf_symbol_filtered (&stb, SYMBOL_PRINT_NAME (arg->sym),
|
||||
fprintf_symbol_filtered (&stb, arg->sym->print_name (),
|
||||
SYMBOL_LANGUAGE (arg->sym), DMGL_PARAMS | DMGL_ANSI);
|
||||
if (arg->entry_kind == print_entry_values_compact)
|
||||
{
|
||||
@@ -435,7 +435,7 @@ print_frame_arg (const frame_print_options &fp_opts,
|
||||
PRINT_ENTRY_VALUE_COMPACT we never use MI. */
|
||||
stb.puts ("=");
|
||||
|
||||
fprintf_symbol_filtered (&stb, SYMBOL_PRINT_NAME (arg->sym),
|
||||
fprintf_symbol_filtered (&stb, arg->sym->print_name (),
|
||||
SYMBOL_LANGUAGE (arg->sym),
|
||||
DMGL_PARAMS | DMGL_ANSI);
|
||||
}
|
||||
@@ -817,11 +817,11 @@ print_frame_args (const frame_print_options &fp_opts,
|
||||
parameter names occur on the RS/6000, for traceback
|
||||
tables. FIXME, should we even print them? */
|
||||
|
||||
if (*SYMBOL_LINKAGE_NAME (sym))
|
||||
if (*sym->linkage_name ())
|
||||
{
|
||||
struct symbol *nsym;
|
||||
|
||||
nsym = lookup_symbol_search_name (SYMBOL_SEARCH_NAME (sym),
|
||||
nsym = lookup_symbol_search_name (sym->search_name (),
|
||||
b, VAR_DOMAIN).symbol;
|
||||
gdb_assert (nsym != NULL);
|
||||
if (SYMBOL_CLASS (nsym) == LOC_REGISTER
|
||||
@@ -1259,14 +1259,14 @@ find_frame_funname (struct frame_info *frame, enum language *funlang,
|
||||
func = get_frame_function (frame);
|
||||
if (func)
|
||||
{
|
||||
const char *print_name = SYMBOL_PRINT_NAME (func);
|
||||
const char *print_name = func->print_name ();
|
||||
|
||||
*funlang = SYMBOL_LANGUAGE (func);
|
||||
if (funcp)
|
||||
*funcp = func;
|
||||
if (*funlang == language_cplus)
|
||||
{
|
||||
/* It seems appropriate to use SYMBOL_PRINT_NAME() here,
|
||||
/* It seems appropriate to use print_name() here,
|
||||
to display the demangled name that we already have
|
||||
stored in the symbol table, but we stored a version
|
||||
with DMGL_PARAMS turned on, and here we don't want to
|
||||
@@ -1494,11 +1494,11 @@ info_frame_command_core (struct frame_info *fi, bool selected_frame_p)
|
||||
gdb::unique_xmalloc_ptr<char> func_only;
|
||||
if (func)
|
||||
{
|
||||
funname = SYMBOL_PRINT_NAME (func);
|
||||
funname = func->print_name ();
|
||||
funlang = SYMBOL_LANGUAGE (func);
|
||||
if (funlang == language_cplus)
|
||||
{
|
||||
/* It seems appropriate to use SYMBOL_PRINT_NAME() here,
|
||||
/* It seems appropriate to use print_name() here,
|
||||
to display the demangled name that we already have
|
||||
stored in the symbol table, but we stored a version
|
||||
with DMGL_PARAMS turned on, and here we don't want to
|
||||
@@ -2246,7 +2246,7 @@ iterate_over_block_locals (const struct block *b,
|
||||
break;
|
||||
if (SYMBOL_DOMAIN (sym) == COMMON_BLOCK_DOMAIN)
|
||||
break;
|
||||
(*cb) (SYMBOL_PRINT_NAME (sym), sym, cb_data);
|
||||
(*cb) (sym->print_name (), sym, cb_data);
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -2276,7 +2276,7 @@ print_block_frame_labels (struct gdbarch *gdbarch, struct block *b,
|
||||
|
||||
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
||||
{
|
||||
if (strcmp (SYMBOL_LINKAGE_NAME (sym), "default") == 0)
|
||||
if (strcmp (sym->linkage_name (), "default") == 0)
|
||||
{
|
||||
if (*have_default)
|
||||
continue;
|
||||
@@ -2289,7 +2289,7 @@ print_block_frame_labels (struct gdbarch *gdbarch, struct block *b,
|
||||
|
||||
sal = find_pc_line (SYMBOL_VALUE_ADDRESS (sym), 0);
|
||||
values_printed = 1;
|
||||
fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);
|
||||
fputs_filtered (sym->print_name (), stream);
|
||||
get_user_print_options (&opts);
|
||||
if (opts.addressprint)
|
||||
{
|
||||
@@ -2351,8 +2351,7 @@ do_print_variable_and_value (const char *print_name,
|
||||
struct frame_info *frame;
|
||||
|
||||
if (p->preg.has_value ()
|
||||
&& p->preg->exec (SYMBOL_NATURAL_NAME (sym), 0,
|
||||
NULL, 0) != 0)
|
||||
&& p->preg->exec (sym->natural_name (), 0, NULL, 0) != 0)
|
||||
return;
|
||||
if (p->treg.has_value ()
|
||||
&& !treg_matches_sym_type_name (*p->treg, sym))
|
||||
@@ -2554,9 +2553,9 @@ iterate_over_block_arg_vars (const struct block *b,
|
||||
float). There are also LOC_ARG/LOC_REGISTER pairs which
|
||||
are not combined in symbol-reading. */
|
||||
|
||||
sym2 = lookup_symbol_search_name (SYMBOL_SEARCH_NAME (sym),
|
||||
sym2 = lookup_symbol_search_name (sym->search_name (),
|
||||
b, VAR_DOMAIN).symbol;
|
||||
(*cb) (SYMBOL_PRINT_NAME (sym), sym2, cb_data);
|
||||
(*cb) (sym->print_name (), sym2, cb_data);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2856,7 +2855,7 @@ return_command (const char *retval_exp, int from_tty)
|
||||
if (TYPE_NO_RETURN (thisfun->type))
|
||||
warning (_("Function does not return normally to caller."));
|
||||
confirmed = query (_("%sMake %s return now? "), query_prefix,
|
||||
SYMBOL_PRINT_NAME (thisfun));
|
||||
thisfun->print_name ());
|
||||
}
|
||||
if (!confirmed)
|
||||
error (_("Not confirmed"));
|
||||
|
||||
Reference in New Issue
Block a user