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:
Christian Biesinger
parent
c9d95fa3d0
commit
987012b89b
57 changed files with 481 additions and 376 deletions
|
|
@ -236,11 +236,11 @@ set_traceframe_context (struct frame_info *trace_frame)
|
|||
/* Save func name as "$trace_func", a debugger variable visible to
|
||||
users. */
|
||||
if (traceframe_fun == NULL
|
||||
|| SYMBOL_LINKAGE_NAME (traceframe_fun) == NULL)
|
||||
|| traceframe_fun->linkage_name () == NULL)
|
||||
clear_internalvar (lookup_internalvar ("trace_func"));
|
||||
else
|
||||
set_internalvar_string (lookup_internalvar ("trace_func"),
|
||||
SYMBOL_LINKAGE_NAME (traceframe_fun));
|
||||
traceframe_fun->linkage_name ());
|
||||
|
||||
/* Save file name as "$trace_file", a debugger variable visible to
|
||||
users. */
|
||||
|
|
@ -693,7 +693,7 @@ validate_actionline (const char *line, struct breakpoint *b)
|
|||
{
|
||||
error (_("constant `%s' (value %s) "
|
||||
"will not be collected."),
|
||||
SYMBOL_PRINT_NAME (exp->elts[2].symbol),
|
||||
exp->elts[2].symbol->print_name (),
|
||||
plongest (SYMBOL_VALUE (exp->elts[2].symbol)));
|
||||
}
|
||||
else if (SYMBOL_CLASS (exp->elts[2].symbol)
|
||||
|
|
@ -701,7 +701,7 @@ validate_actionline (const char *line, struct breakpoint *b)
|
|||
{
|
||||
error (_("`%s' is optimized away "
|
||||
"and cannot be collected."),
|
||||
SYMBOL_PRINT_NAME (exp->elts[2].symbol));
|
||||
exp->elts[2].symbol->print_name ());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -926,19 +926,18 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
{
|
||||
default:
|
||||
printf_filtered ("%s: don't know symbol class %d\n",
|
||||
SYMBOL_PRINT_NAME (sym),
|
||||
SYMBOL_CLASS (sym));
|
||||
sym->print_name (), SYMBOL_CLASS (sym));
|
||||
break;
|
||||
case LOC_CONST:
|
||||
printf_filtered ("constant %s (value %s) will not be collected.\n",
|
||||
SYMBOL_PRINT_NAME (sym), plongest (SYMBOL_VALUE (sym)));
|
||||
sym->print_name (), plongest (SYMBOL_VALUE (sym)));
|
||||
break;
|
||||
case LOC_STATIC:
|
||||
offset = SYMBOL_VALUE_ADDRESS (sym);
|
||||
if (info_verbose)
|
||||
{
|
||||
printf_filtered ("LOC_STATIC %s: collect %ld bytes at %s.\n",
|
||||
SYMBOL_PRINT_NAME (sym), len,
|
||||
sym->print_name (), len,
|
||||
paddress (gdbarch, offset));
|
||||
}
|
||||
/* A struct may be a C++ class with static fields, go to general
|
||||
|
|
@ -951,8 +950,7 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
case LOC_REGISTER:
|
||||
reg = SYMBOL_REGISTER_OPS (sym)->register_number (sym, gdbarch);
|
||||
if (info_verbose)
|
||||
printf_filtered ("LOC_REG[parm] %s: ",
|
||||
SYMBOL_PRINT_NAME (sym));
|
||||
printf_filtered ("LOC_REG[parm] %s: ", sym->print_name ());
|
||||
add_local_register (gdbarch, reg, scope);
|
||||
/* Check for doubles stored in two registers. */
|
||||
/* FIXME: how about larger types stored in 3 or more regs? */
|
||||
|
|
@ -962,8 +960,7 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
break;
|
||||
case LOC_REF_ARG:
|
||||
printf_filtered ("Sorry, don't know how to do LOC_REF_ARG yet.\n");
|
||||
printf_filtered (" (will not collect %s)\n",
|
||||
SYMBOL_PRINT_NAME (sym));
|
||||
printf_filtered (" (will not collect %s)\n", sym->print_name ());
|
||||
break;
|
||||
case LOC_ARG:
|
||||
reg = frame_regno;
|
||||
|
|
@ -971,8 +968,7 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
if (info_verbose)
|
||||
{
|
||||
printf_filtered ("LOC_LOCAL %s: Collect %ld bytes at offset %s"
|
||||
" from frame ptr reg %d\n",
|
||||
SYMBOL_PRINT_NAME (sym), len,
|
||||
" from frame ptr reg %d\n", sym->print_name (), len,
|
||||
paddress (gdbarch, offset), reg);
|
||||
}
|
||||
add_memrange (gdbarch, reg, offset, len, scope);
|
||||
|
|
@ -983,8 +979,7 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
if (info_verbose)
|
||||
{
|
||||
printf_filtered ("LOC_REGPARM_ADDR %s: Collect %ld bytes at offset %s"
|
||||
" from reg %d\n",
|
||||
SYMBOL_PRINT_NAME (sym), len,
|
||||
" from reg %d\n", sym->print_name (), len,
|
||||
paddress (gdbarch, offset), reg);
|
||||
}
|
||||
add_memrange (gdbarch, reg, offset, len, scope);
|
||||
|
|
@ -995,8 +990,7 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
if (info_verbose)
|
||||
{
|
||||
printf_filtered ("LOC_LOCAL %s: Collect %ld bytes at offset %s"
|
||||
" from frame ptr reg %d\n",
|
||||
SYMBOL_PRINT_NAME (sym), len,
|
||||
" from frame ptr reg %d\n", sym->print_name (), len,
|
||||
paddress (gdbarch, offset), reg);
|
||||
}
|
||||
add_memrange (gdbarch, reg, offset, len, scope);
|
||||
|
|
@ -1008,7 +1002,7 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
|
||||
case LOC_OPTIMIZED_OUT:
|
||||
printf_filtered ("%s has been optimized out of existence.\n",
|
||||
SYMBOL_PRINT_NAME (sym));
|
||||
sym->print_name ());
|
||||
break;
|
||||
|
||||
case LOC_COMPUTED:
|
||||
|
|
@ -1028,7 +1022,7 @@ collection_list::collect_symbol (struct symbol *sym,
|
|||
if (!aexpr)
|
||||
{
|
||||
printf_filtered ("%s has been optimized out of existence.\n",
|
||||
SYMBOL_PRINT_NAME (sym));
|
||||
sym->print_name ());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1424,7 +1418,7 @@ encode_actions_1 (struct command_line *action,
|
|||
case OP_VAR_VALUE:
|
||||
{
|
||||
struct symbol *sym = exp->elts[2].symbol;
|
||||
const char *name = SYMBOL_NATURAL_NAME (sym);
|
||||
const char *name = sym->natural_name ();
|
||||
|
||||
collect->collect_symbol (exp->elts[2].symbol,
|
||||
target_gdbarch (),
|
||||
|
|
@ -2526,7 +2520,7 @@ info_scope_command (const char *args_in, int from_tty)
|
|||
printf_filtered ("Scope for %s:\n", save_args);
|
||||
count++;
|
||||
|
||||
symname = SYMBOL_PRINT_NAME (sym);
|
||||
symname = sym->print_name ();
|
||||
if (symname == NULL || *symname == '\0')
|
||||
continue; /* Probably botched, certainly useless. */
|
||||
|
||||
|
|
@ -2616,7 +2610,7 @@ info_scope_command (const char *args_in, int from_tty)
|
|||
paddress (gdbarch, BLOCK_ENTRY_PC (SYMBOL_BLOCK_VALUE (sym))));
|
||||
break;
|
||||
case LOC_UNRESOLVED:
|
||||
msym = lookup_minimal_symbol (SYMBOL_LINKAGE_NAME (sym),
|
||||
msym = lookup_minimal_symbol (sym->linkage_name (),
|
||||
NULL, NULL);
|
||||
if (msym.minsym == NULL)
|
||||
printf_filtered ("Unresolved Static");
|
||||
|
|
@ -3689,7 +3683,7 @@ print_one_static_tracepoint_marker (int count,
|
|||
if (sym)
|
||||
{
|
||||
uiout->text ("in ");
|
||||
uiout->field_string ("func", SYMBOL_PRINT_NAME (sym),
|
||||
uiout->field_string ("func", sym->print_name (),
|
||||
function_name_style.style ());
|
||||
uiout->wrap_hint (wrap_indent);
|
||||
uiout->text (" at ");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue