224c3ddb89
Most allocation functions (if not all) return a void* pointing to the allocated memory. In C++, we need to add an explicit cast when assigning the result to a pointer to another type (which is the case more often than not). The content of this patch is taken from Pedro's branch, from commit "(mostly) auto-generated patch to insert casts needed for C++". I validated that the changes make sense and manually reflowed the code to make it respect the coding style. I also found multiple places where I could use XNEW/XNEWVEC/XRESIZEVEC/etc. Thanks a lot to whoever did that automated script to insert casts, doing it completely by hand would have taken a ridiculous amount of time. Only files built on x86 with --enable-targets=all are modified. This means that all other -nat.c files are untouched and will have to be dealt with later by using appropiate compilers. Or maybe we can try to build them with a regular g++ just to know where to add casts, I don't know. I built-tested this with --enable-targets=all and reg-tested. Here's the changelog entry, which was not too bad to make despite the size, thanks to David Malcom's script. I fixed some bits by hand, but there might be some wrong parts left (hopefully not). gdb/ChangeLog: * aarch64-linux-tdep.c (aarch64_stap_parse_special_token): Add cast to allocation result assignment. * ada-exp.y (write_object_renaming): Likewise. (write_ambiguous_var): Likewise. (ada_nget_field_index): Likewise. (write_var_or_type): Likewise. * ada-lang.c (ada_decode_symbol): Likewise. (ada_value_assign): Likewise. (value_pointer): Likewise. (cache_symbol): Likewise. (add_nonlocal_symbols): Likewise. (ada_name_for_lookup): Likewise. (symbol_completion_add): Likewise. (ada_to_fixed_type_1): Likewise. (ada_get_next_arg): Likewise. (defns_collected): Likewise. * ada-lex.l (processId): Likewise. (processString): Likewise. * ada-tasks.c (read_known_tasks_array): Likewise. (read_known_tasks_list): Likewise. * ada-typeprint.c (decoded_type_name): Likewise. * addrmap.c (addrmap_mutable_create_fixed): Likewise. * amd64-tdep.c (amd64_push_arguments): Likewise. (amd64_displaced_step_copy_insn): Likewise. (amd64_classify_insn_at): Likewise. (amd64_relocate_instruction): Likewise. * amd64obsd-tdep.c (amd64obsd_sigtramp_p): Likewise. * arch-utils.c (simple_displaced_step_copy_insn): Likewise. (initialize_current_architecture): Likewise. * arm-linux-tdep.c (arm_stap_parse_special_token): Likewise. * arm-symbian-tdep.c (arm_symbian_osabi_sniffer): Likewise. * arm-tdep.c (arm_exidx_new_objfile): Likewise. (arm_push_dummy_call): Likewise. (extend_buffer_earlier): Likewise. (arm_adjust_breakpoint_address): Likewise. (arm_skip_stub): Likewise. * auto-load.c (filename_is_in_pattern): Likewise. (maybe_add_script_file): Likewise. (maybe_add_script_text): Likewise. (auto_load_objfile_script_1): Likewise. * auxv.c (ld_so_xfer_auxv): Likewise. * ax-general.c (new_agent_expr): Likewise. (grow_expr): Likewise. (ax_reg_mask): Likewise. * bcache.c (bcache_full): Likewise. * breakpoint.c (program_breakpoint_here_p): Likewise. * btrace.c (parse_xml_raw): Likewise. * build-id.c (build_id_to_debug_bfd): Likewise. * buildsym.c (end_symtab_with_blockvector): Likewise. * c-exp.y (string_exp): Likewise. (qualified_name): Likewise. (write_destructor_name): Likewise. (operator_stoken): Likewise. (parse_number): Likewise. (scan_macro_expansion): Likewise. (yylex): Likewise. (c_print_token): Likewise. * c-lang.c (c_get_string): Likewise. (emit_numeric_character): Likewise. * charset.c (wchar_iterate): Likewise. * cli/cli-cmds.c (complete_command): Likewise. (make_command): Likewise. * cli/cli-dump.c (restore_section_callback): Likewise. (restore_binary_file): Likewise. * cli/cli-interp.c (cli_interpreter_exec): Likewise. * cli/cli-script.c (execute_control_command): Likewise. * cli/cli-setshow.c (do_set_command): Likewise. * coff-pe-read.c (add_pe_forwarded_sym): Likewise. (read_pe_exported_syms): Likewise. * coffread.c (coff_read_struct_type): Likewise. (coff_read_enum_type): Likewise. * common/btrace-common.c (btrace_data_append): Likewise. * common/buffer.c (buffer_grow): Likewise. * common/filestuff.c (gdb_fopen_cloexec): Likewise. * common/format.c (parse_format_string): Likewise. * common/gdb_vecs.c (delim_string_to_char_ptr_vec_append): Likewise. * common/xml-utils.c (xml_escape_text): Likewise. * compile/compile-object-load.c (copy_sections): Likewise. (compile_object_load): Likewise. * compile/compile-object-run.c (compile_object_run): Likewise. * completer.c (filename_completer): Likewise. * corefile.c (read_memory_typed_address): Likewise. (write_memory_unsigned_integer): Likewise. (write_memory_signed_integer): Likewise. (complete_set_gnutarget): Likewise. * corelow.c (get_core_register_section): Likewise. * cp-name-parser.y (d_grab): Likewise. (allocate_info): Likewise. (cp_new_demangle_parse_info): Likewise. * cp-namespace.c (cp_scan_for_anonymous_namespaces): Likewise. (cp_lookup_symbol_in_namespace): Likewise. (lookup_namespace_scope): Likewise. (find_symbol_in_baseclass): Likewise. (cp_lookup_nested_symbol): Likewise. (cp_lookup_transparent_type_loop): Likewise. * cp-support.c (copy_string_to_obstack): Likewise. (make_symbol_overload_list): Likewise. (make_symbol_overload_list_namespace): Likewise. (make_symbol_overload_list_adl_namespace): Likewise. (first_component_command): Likewise. * cp-valprint.c (cp_print_value): Likewise. * ctf.c (ctf_xfer_partial): Likewise. * d-exp.y (StringExp): Likewise. * d-namespace.c (d_lookup_symbol_in_module): Likewise. (lookup_module_scope): Likewise. (find_symbol_in_baseclass): Likewise. (d_lookup_nested_symbol): Likewise. * dbxread.c (find_stab_function_addr): Likewise. (read_dbx_symtab): Likewise. (dbx_end_psymtab): Likewise. (cp_set_block_scope): Likewise. * dcache.c (dcache_alloc): Likewise. * demangle.c (_initialize_demangler): Likewise. * dicos-tdep.c (dicos_load_module_p): Likewise. * dictionary.c (dict_create_hashed_expandable): Likewise. (dict_create_linear_expandable): Likewise. (expand_hashtable): Likewise. (add_symbol_linear_expandable): Likewise. * dwarf2-frame.c (add_cie): Likewise. (add_fde): Likewise. (dwarf2_build_frame_info): Likewise. * dwarf2expr.c (dwarf_expr_grow_stack): Likewise. (dwarf_expr_fetch_address): Likewise. (add_piece): Likewise. (execute_stack_op): Likewise. * dwarf2loc.c (chain_candidate): Likewise. (dwarf_entry_parameter_to_value): Likewise. (read_pieced_value): Likewise. (write_pieced_value): Likewise. * dwarf2read.c (dwarf2_read_section): Likewise. (add_type_unit): Likewise. (read_comp_units_from_section): Likewise. (fixup_go_packaging): Likewise. (dwarf2_compute_name): Likewise. (dwarf2_physname): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (read_func_scope): Likewise. (read_call_site_scope): Likewise. (dwarf2_attach_fields_to_type): Likewise. (process_structure_scope): Likewise. (mark_common_block_symbol_computed): Likewise. (read_common_block): Likewise. (abbrev_table_read_table): Likewise. (guess_partial_die_structure_name): Likewise. (fixup_partial_die): Likewise. (add_file_name): Likewise. (dwarf2_const_value_data): Likewise. (dwarf2_const_value_attr): Likewise. (build_error_marker_type): Likewise. (guess_full_die_structure_name): Likewise. (anonymous_struct_prefix): Likewise. (typename_concat): Likewise. (dwarf2_canonicalize_name): Likewise. (dwarf2_name): Likewise. (write_constant_as_bytes): Likewise. (dwarf2_fetch_constant_bytes): Likewise. (copy_string): Likewise. (parse_macro_definition): Likewise. * elfread.c (elf_symfile_segments): Likewise. (elf_rel_plt_read): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_gnu_ifunc_resolve_by_got): Likewise. (elf_read_minimal_symbols): Likewise. (elf_gnu_ifunc_record_cache): Likewise. * event-top.c (top_level_prompt): Likewise. (command_line_handler): Likewise. * exec.c (resize_section_table): Likewise. * expprint.c (print_subexp_standard): Likewise. * fbsd-tdep.c (fbsd_collect_regset_section_cb): Likewise. * findcmd.c (parse_find_args): Likewise. * findvar.c (address_from_register): Likewise. * frame.c (get_prev_frame_always): Likewise. * gdb_bfd.c (gdb_bfd_ref): Likewise. (get_section_descriptor): Likewise. * gdb_obstack.c (obconcat): Likewise. (obstack_strdup): Likewise. * gdbtypes.c (lookup_function_type_with_arguments): Likewise. (create_set_type): Likewise. (lookup_unsigned_typename): Likewise. (lookup_signed_typename): Likewise. (resolve_dynamic_union): Likewise. (resolve_dynamic_struct): Likewise. (add_dyn_prop): Likewise. (copy_dynamic_prop_list): Likewise. (arch_flags_type): Likewise. (append_composite_type_field_raw): Likewise. * gdbtypes.h (INIT_FUNC_SPECIFIC): Likewise. * gnu-v3-abi.c (gnuv3_rtti_type): Likewise. * go-exp.y (string_exp): Likewise. * go-lang.c (go_demangle): Likewise. * guile/guile.c (compute_scheme_string): Likewise. * guile/scm-cmd.c (gdbscm_parse_command_name): Likewise. (gdbscm_canonicalize_command_name): Likewise. * guile/scm-ports.c (ioscm_init_stdio_buffers): Likewise. (ioscm_init_memory_port): Likewise. (ioscm_reinit_memory_port): Likewise. * guile/scm-utils.c (gdbscm_gc_xstrdup): Likewise. (gdbscm_gc_dup_argv): Likewise. * h8300-tdep.c (h8300_push_dummy_call): Likewise. * hppa-tdep.c (internalize_unwinds): Likewise. (read_unwind_info): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. (windows_core_xfer_shared_libraries): Likewise. * i386-tdep.c (i386_displaced_step_copy_insn): Likewise. (i386_stap_parse_special_token_triplet): Likewise. (i386_stap_parse_special_token_three_arg_disp): Likewise. * i386obsd-tdep.c (i386obsd_sigtramp_p): Likewise. * inf-child.c (inf_child_fileio_readlink): Likewise. * inf-ptrace.c (inf_ptrace_fetch_register): Likewise. (inf_ptrace_store_register): Likewise. * infrun.c (follow_exec): Likewise. (displaced_step_prepare_throw): Likewise. (save_stop_context): Likewise. (save_infcall_suspend_state): Likewise. * jit.c (jit_read_descriptor): Likewise. (jit_read_code_entry): Likewise. (jit_symtab_line_mapping_add_impl): Likewise. (finalize_symtab): Likewise. (jit_unwind_reg_get_impl): Likewise. * jv-exp.y (QualifiedName): Likewise. * jv-lang.c (get_java_utf8_name): Likewise. (type_from_class): Likewise. (java_demangle_type_signature): Likewise. (java_class_name_from_physname): Likewise. * jv-typeprint.c (java_type_print_base): Likewise. * jv-valprint.c (java_value_print): Likewise. * language.c (add_language): Likewise. * linespec.c (add_sal_to_sals_basic): Likewise. (add_sal_to_sals): Likewise. (decode_objc): Likewise. (find_linespec_symbols): Likewise. * linux-fork.c (fork_save_infrun_state): Likewise. * linux-nat.c (linux_nat_detach): Likewise. (linux_nat_fileio_readlink): Likewise. * linux-record.c (record_linux_sockaddr): Likewise. (record_linux_msghdr): Likewise. (Do): Likewise. * linux-tdep.c (linux_core_info_proc_mappings): Likewise. (linux_collect_regset_section_cb): Likewise. (linux_get_siginfo_data): Likewise. * linux-thread-db.c (try_thread_db_load_from_pdir_1): Likewise. (try_thread_db_load_from_dir): Likewise. (thread_db_load_search): Likewise. (info_auto_load_libthread_db): Likewise. * m32c-tdep.c (m32c_m16c_address_to_pointer): Likewise. (m32c_m16c_pointer_to_address): Likewise. * m68hc11-tdep.c (m68hc11_pseudo_register_write): Likewise. * m68k-tdep.c (m68k_get_longjmp_target): Likewise. * machoread.c (macho_check_dsym): Likewise. * macroexp.c (resize_buffer): Likewise. (gather_arguments): Likewise. (maybe_expand): Likewise. * macrotab.c (new_macro_key): Likewise. (new_source_file): Likewise. (new_macro_definition): Likewise. * mdebugread.c (parse_symbol): Likewise. (parse_type): Likewise. (parse_partial_symbols): Likewise. (psymtab_to_symtab_1): Likewise. * mem-break.c (default_memory_insert_breakpoint): Likewise. * mi/mi-cmd-break.c (mi_argv_to_format): Likewise. * mi/mi-main.c (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_data_write_memory_bytes): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-parse.c (mi_parse_argv): Likewise. (mi_parse): Likewise. * minidebug.c (lzma_open): Likewise. (lzma_pread): Likewise. * mips-tdep.c (mips_read_fp_register_single): Likewise. (mips_print_fp_register): Likewise. * mipsnbsd-tdep.c (mipsnbsd_get_longjmp_target): Likewise. * mipsread.c (read_alphacoff_dynamic_symtab): Likewise. * mt-tdep.c (mt_register_name): Likewise. (mt_registers_info): Likewise. (mt_push_dummy_call): Likewise. * namespace.c (add_using_directive): Likewise. * nat/linux-btrace.c (perf_event_read): Likewise. (linux_enable_bts): Likewise. * nat/linux-osdata.c (linux_common_core_of_thread): Likewise. * nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Likewise. * nto-tdep.c (nto_find_and_open_solib): Likewise. (nto_parse_redirection): Likewise. * objc-lang.c (objc_demangle): Likewise. (find_methods): Likewise. * objfiles.c (get_objfile_bfd_data): Likewise. (set_objfile_main_name): Likewise. (allocate_objfile): Likewise. (objfile_relocate): Likewise. (update_section_map): Likewise. * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Likewise. * p-exp.y (exp): Likewise. (yylex): Likewise. * p-valprint.c (pascal_object_print_value): Likewise. * parse.c (initialize_expout): Likewise. (mark_completion_tag): Likewise. (copy_name): Likewise. (parse_float): Likewise. (type_stack_reserve): Likewise. * ppc-linux-tdep.c (ppc_stap_parse_special_token): Likewise. (ppu2spu_prev_register): Likewise. * ppc-ravenscar-thread.c (supply_register_at_address): Likewise. * printcmd.c (printf_wide_c_string): Likewise. (printf_pointer): Likewise. * probe.c (parse_probes): Likewise. * python/py-cmd.c (gdbpy_parse_command_name): Likewise. (cmdpy_init): Likewise. * python/py-gdb-readline.c (gdbpy_readline_wrapper): Likewise. * python/py-symtab.c (set_sal): Likewise. * python/py-unwind.c (pyuw_sniffer): Likewise. * python/python.c (python_interactive_command): Likewise. (compute_python_string): Likewise. * ravenscar-thread.c (get_running_thread_id): Likewise. * record-full.c (record_full_exec_insn): Likewise. (record_full_core_open_1): Likewise. * regcache.c (regcache_raw_read_signed): Likewise. (regcache_raw_read_unsigned): Likewise. (regcache_cooked_read_signed): Likewise. (regcache_cooked_read_unsigned): Likewise. * remote-fileio.c (remote_fileio_func_open): Likewise. (remote_fileio_func_rename): Likewise. (remote_fileio_func_unlink): Likewise. (remote_fileio_func_stat): Likewise. (remote_fileio_func_system): Likewise. * remote-mips.c (mips_xfer_memory): Likewise. (mips_load_srec): Likewise. (pmon_end_download): Likewise. * remote.c (new_remote_state): Likewise. (map_regcache_remote_table): Likewise. (remote_register_number_and_offset): Likewise. (init_remote_state): Likewise. (get_memory_packet_size): Likewise. (remote_pass_signals): Likewise. (remote_program_signals): Likewise. (remote_start_remote): Likewise. (remote_check_symbols): Likewise. (remote_query_supported): Likewise. (extended_remote_attach): Likewise. (process_g_packet): Likewise. (store_registers_using_G): Likewise. (putpkt_binary): Likewise. (read_frame): Likewise. (compare_sections_command): Likewise. (remote_hostio_pread): Likewise. (remote_hostio_readlink): Likewise. (remote_file_put): Likewise. (remote_file_get): Likewise. (remote_pid_to_exec_file): Likewise. (_initialize_remote): Likewise. * rs6000-aix-tdep.c (rs6000_aix_ld_info_to_xml): Likewise. (rs6000_aix_core_xfer_shared_libraries_aix): Likewise. * rs6000-tdep.c (ppc_displaced_step_copy_insn): Likewise. (bfd_uses_spe_extensions): Likewise. * s390-linux-tdep.c (s390_displaced_step_copy_insn): Likewise. * score-tdep.c (score7_malloc_and_get_memblock): Likewise. * solib-dsbt.c (decode_loadmap): Likewise. (fetch_loadmap): Likewise. (scan_dyntag): Likewise. (enable_break): Likewise. (dsbt_relocate_main_executable): Likewise. * solib-frv.c (fetch_loadmap): Likewise. (enable_break2): Likewise. (frv_relocate_main_executable): Likewise. * solib-spu.c (spu_relocate_main_executable): Likewise. (spu_bfd_open): Likewise. * solib-svr4.c (lm_info_read): Likewise. (read_program_header): Likewise. (find_program_interpreter): Likewise. (scan_dyntag): Likewise. (elf_locate_base): Likewise. (open_symbol_file_object): Likewise. (read_program_headers_from_bfd): Likewise. (svr4_relocate_main_executable): Likewise. * solib-target.c (solib_target_relocate_section_addresses): Likewise. * solib.c (solib_find_1): Likewise. (exec_file_find): Likewise. (solib_find): Likewise. * source.c (openp): Likewise. (print_source_lines_base): Likewise. (forward_search_command): Likewise. * sparc-ravenscar-thread.c (supply_register_at_address): Likewise. * spu-tdep.c (spu2ppu_prev_register): Likewise. (spu_get_overlay_table): Likewise. * stabsread.c (patch_block_stabs): Likewise. (define_symbol): Likewise. (again:): Likewise. (read_member_functions): Likewise. (read_one_struct_field): Likewise. (read_enum_type): Likewise. (common_block_start): Likewise. * stack.c (read_frame_arg): Likewise. (backtrace_command): Likewise. * stap-probe.c (stap_parse_register_operand): Likewise. * symfile.c (syms_from_objfile_1): Likewise. (find_separate_debug_file): Likewise. (load_command): Likewise. (load_progress): Likewise. (load_section_callback): Likewise. (reread_symbols): Likewise. (add_filename_language): Likewise. (allocate_compunit_symtab): Likewise. (read_target_long_array): Likewise. (simple_read_overlay_table): Likewise. * symtab.c (symbol_set_names): Likewise. (resize_symbol_cache): Likewise. (rbreak_command): Likewise. (completion_list_add_name): Likewise. (completion_list_objc_symbol): Likewise. (add_filename_to_list): Likewise. * target-descriptions.c (maint_print_c_tdesc_cmd): Likewise. * target-memory.c (target_write_memory_blocks): Likewise. * target.c (target_read_string): Likewise. (read_whatever_is_readable): Likewise. (target_read_alloc_1): Likewise. (simple_search_memory): Likewise. (target_fileio_read_alloc_1): Likewise. * tilegx-tdep.c (tilegx_push_dummy_call): Likewise. * top.c (command_line_input): Likewise. * tracefile-tfile.c (tfile_fetch_registers): Likewise. * tracefile.c (tracefile_fetch_registers): Likewise. * tracepoint.c (add_memrange): Likewise. (init_collection_list): Likewise. (add_aexpr): Likewise. (trace_dump_actions): Likewise. (parse_trace_status): Likewise. (parse_tracepoint_definition): Likewise. (parse_tsv_definition): Likewise. (parse_static_tracepoint_marker_definition): Likewise. * tui/tui-file.c (tui_sfileopen): Likewise. (tui_file_adjust_strbuf): Likewise. * tui/tui-io.c (tui_expand_tabs): Likewise. * tui/tui-source.c (tui_set_source_content): Likewise. * typeprint.c (find_global_typedef): Likewise. * ui-file.c (do_ui_file_xstrdup): Likewise. (ui_file_obsavestring): Likewise. (mem_file_write): Likewise. * utils.c (make_hex_string): Likewise. (get_regcomp_error): Likewise. (puts_filtered_tabular): Likewise. (gdb_realpath_keepfile): Likewise. (ldirname): Likewise. (gdb_bfd_errmsg): Likewise. (substitute_path_component): Likewise. * valops.c (search_struct_method): Likewise. (find_oload_champ_namespace_loop): Likewise. * valprint.c (print_decimal_chars): Likewise. (read_string): Likewise. (generic_emit_char): Likewise. * varobj.c (varobj_delete): Likewise. (varobj_value_get_print_value): Likewise. * vaxobsd-tdep.c (vaxobsd_sigtramp_sniffer): Likewise. * windows-tdep.c (display_one_tib): Likewise. * xcoffread.c (read_xcoff_symtab): Likewise. (process_xcoff_symbol): Likewise. (swap_sym): Likewise. (scan_xcoff_symtab): Likewise. (xcoff_initial_scan): Likewise. * xml-support.c (gdb_xml_end_element): Likewise. (xml_process_xincludes): Likewise. (xml_fetch_content_from_file): Likewise. * xml-syscall.c (xml_list_of_syscalls): Likewise. * xstormy16-tdep.c (xstormy16_push_dummy_call): Likewise. gdb/gdbserver/ChangeLog: * ax.c (gdb_parse_agent_expr): Add cast to allocation result assignment. (gdb_unparse_agent_expr): Likewise. * hostio.c (require_data): Likewise. (handle_pread): Likewise. * linux-low.c (disable_regset): Likewise. (fetch_register): Likewise. (store_register): Likewise. (get_dynamic): Likewise. (linux_qxfer_libraries_svr4): Likewise. * mem-break.c (delete_fast_tracepoint_jump): Likewise. (set_fast_tracepoint_jump): Likewise. (uninsert_fast_tracepoint_jumps_at): Likewise. (reinsert_fast_tracepoint_jumps_at): Likewise. (validate_inserted_breakpoint): Likewise. (clone_agent_expr): Likewise. * regcache.c (init_register_cache): Likewise. * remote-utils.c (putpkt_binary_1): Likewise. (decode_M_packet): Likewise. (decode_X_packet): Likewise. (look_up_one_symbol): Likewise. (relocate_instruction): Likewise. (monitor_output): Likewise. * server.c (handle_search_memory): Likewise. (handle_qxfer_exec_file): Likewise. (handle_qxfer_libraries): Likewise. (handle_qxfer): Likewise. (handle_query): Likewise. (handle_v_cont): Likewise. (handle_v_run): Likewise. (captured_main): Likewise. * target.c (write_inferior_memory): Likewise. * thread-db.c (try_thread_db_load_from_dir): Likewise. * tracepoint.c (init_trace_buffer): Likewise. (add_tracepoint_action): Likewise. (add_traceframe): Likewise. (add_traceframe_block): Likewise. (cmd_qtdpsrc): Likewise. (cmd_qtdv): Likewise. (cmd_qtstatus): Likewise. (response_source): Likewise. (response_tsv): Likewise. (cmd_qtnotes): Likewise. (gdb_collect): Likewise. (initialize_tracepoint): Likewise.
563 lines
17 KiB
C
563 lines
17 KiB
C
/* Helper routines for D support in GDB.
|
|
|
|
Copyright (C) 2014-2015 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "symtab.h"
|
|
#include "block.h"
|
|
#include "language.h"
|
|
#include "namespace.h"
|
|
#include "d-lang.h"
|
|
#include "gdb_obstack.h"
|
|
|
|
/* This returns the length of first component of NAME, which should be
|
|
the demangled name of a D variable/function/method/etc.
|
|
Specifically, it returns the index of the first dot forming the
|
|
boundary of the first component: so, given 'A.foo' or 'A.B.foo'
|
|
it returns the 1, and given 'foo', it returns 0. */
|
|
|
|
/* The character in NAME indexed by the return value is guaranteed to
|
|
always be either '.' or '\0'. */
|
|
|
|
static unsigned int
|
|
d_find_first_component (const char *name)
|
|
{
|
|
unsigned int index = 0;
|
|
|
|
for (;; ++index)
|
|
{
|
|
if (name[index] == '.' || name[index] == '\0')
|
|
return index;
|
|
}
|
|
}
|
|
|
|
/* If NAME is the fully-qualified name of a D function/variable/method,
|
|
this returns the length of its entire prefix: all of the modules and
|
|
classes that make up its name. Given 'A.foo', it returns 1, given
|
|
'A.B.foo', it returns 4, given 'foo', it returns 0. */
|
|
|
|
static unsigned int
|
|
d_entire_prefix_len (const char *name)
|
|
{
|
|
unsigned int current_len = d_find_first_component (name);
|
|
unsigned int previous_len = 0;
|
|
|
|
while (name[current_len] != '\0')
|
|
{
|
|
gdb_assert (name[current_len] == '.');
|
|
previous_len = current_len;
|
|
/* Skip the '.' */
|
|
current_len++;
|
|
current_len += d_find_first_component (name + current_len);
|
|
}
|
|
|
|
return previous_len;
|
|
}
|
|
|
|
/* Look up NAME in BLOCK's static block and in global blocks.
|
|
If SEARCH is non-zero, search through base classes for a matching
|
|
symbol. Other arguments are as in d_lookup_symbol_nonlocal. */
|
|
|
|
static struct block_symbol
|
|
d_lookup_symbol (const char *name, const struct block *block,
|
|
const domain_enum domain, int search)
|
|
{
|
|
struct block_symbol sym;
|
|
|
|
sym = lookup_symbol_in_static_block (name, block, domain);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
sym = lookup_global_symbol (name, block, domain);
|
|
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
if (search)
|
|
{
|
|
char *classname, *nested;
|
|
unsigned int prefix_len;
|
|
struct cleanup *cleanup;
|
|
struct block_symbol class_sym;
|
|
|
|
/* A simple lookup failed. Check if the symbol was defined in
|
|
a base class. */
|
|
|
|
cleanup = make_cleanup (null_cleanup, NULL);
|
|
|
|
/* Find the name of the class and the name of the method,
|
|
variable, etc. */
|
|
prefix_len = d_entire_prefix_len (name);
|
|
|
|
/* If no prefix was found, search "this". */
|
|
if (prefix_len == 0)
|
|
{
|
|
struct type *type;
|
|
struct block_symbol lang_this;
|
|
|
|
lang_this = lookup_language_this (language_def (language_d), block);
|
|
if (lang_this.symbol == NULL)
|
|
{
|
|
do_cleanups (cleanup);
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
|
|
type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (lang_this.symbol)));
|
|
classname = xstrdup (TYPE_NAME (type));
|
|
nested = xstrdup (name);
|
|
}
|
|
else
|
|
{
|
|
/* The class name is everything up to and including PREFIX_LEN. */
|
|
classname = savestring (name, prefix_len);
|
|
|
|
/* The rest of the name is everything else past the initial scope
|
|
operator. */
|
|
nested = xstrdup (name + prefix_len + 1);
|
|
}
|
|
|
|
/* Add cleanups to free memory for these strings. */
|
|
make_cleanup (xfree, classname);
|
|
make_cleanup (xfree, nested);
|
|
|
|
/* Lookup a class named CLASSNAME. If none is found, there is nothing
|
|
more that can be done. */
|
|
class_sym = lookup_global_symbol (classname, block, domain);
|
|
if (class_sym.symbol == NULL)
|
|
{
|
|
do_cleanups (cleanup);
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
|
|
/* Look for a symbol named NESTED in this class. */
|
|
sym = d_lookup_nested_symbol (SYMBOL_TYPE (class_sym.symbol),
|
|
nested, block);
|
|
do_cleanups (cleanup);
|
|
}
|
|
|
|
return sym;
|
|
}
|
|
|
|
/* Look up NAME in the D module MODULE. Other arguments are as in
|
|
d_lookup_symbol_nonlocal. If SEARCH is non-zero, search through
|
|
base classes for a matching symbol. */
|
|
|
|
static struct block_symbol
|
|
d_lookup_symbol_in_module (const char *module, const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain, int search)
|
|
{
|
|
char *concatenated_name = NULL;
|
|
|
|
if (module[0] != '\0')
|
|
{
|
|
concatenated_name
|
|
= (char *) alloca (strlen (module) + strlen (name) + 2);
|
|
strcpy (concatenated_name, module);
|
|
strcat (concatenated_name, ".");
|
|
strcat (concatenated_name, name);
|
|
name = concatenated_name;
|
|
}
|
|
|
|
return d_lookup_symbol (name, block, domain, search);
|
|
}
|
|
|
|
/* Lookup NAME at module scope. SCOPE is the module that the current
|
|
function is defined within; only consider modules whose length is at
|
|
least SCOPE_LEN. Other arguments are as in d_lookup_symbol_nonlocal.
|
|
|
|
For example, if we're within a function A.B.f and looking for a
|
|
symbol x, this will get called with NAME = "x", SCOPE = "A.B", and
|
|
SCOPE_LEN = 0. It then calls itself with NAME and SCOPE the same,
|
|
but with SCOPE_LEN = 1. And then it calls itself with NAME and
|
|
SCOPE the same, but with SCOPE_LEN = 4. This third call looks for
|
|
"A.B.x"; if it doesn't find it, then the second call looks for "A.x",
|
|
and if that call fails, then the first call looks for "x". */
|
|
|
|
static struct block_symbol
|
|
lookup_module_scope (const char *name, const struct block *block,
|
|
const domain_enum domain, const char *scope,
|
|
int scope_len)
|
|
{
|
|
char *module;
|
|
|
|
if (scope[scope_len] != '\0')
|
|
{
|
|
/* Recursively search for names in child modules first. */
|
|
|
|
struct block_symbol sym;
|
|
int new_scope_len = scope_len;
|
|
|
|
/* If the current scope is followed by ".", skip past that. */
|
|
if (new_scope_len != 0)
|
|
{
|
|
gdb_assert (scope[new_scope_len] == '.');
|
|
new_scope_len++;
|
|
}
|
|
new_scope_len += d_find_first_component (scope + new_scope_len);
|
|
sym = lookup_module_scope (name, block, domain,
|
|
scope, new_scope_len);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
}
|
|
|
|
/* Okay, we didn't find a match in our children, so look for the
|
|
name in the current module. */
|
|
|
|
module = (char *) alloca (scope_len + 1);
|
|
strncpy (module, scope, scope_len);
|
|
module[scope_len] = '\0';
|
|
return d_lookup_symbol_in_module (module, name,
|
|
block, domain, 1);
|
|
}
|
|
|
|
/* Search through the base classes of PARENT_TYPE for a symbol named
|
|
NAME in block BLOCK. */
|
|
|
|
static struct block_symbol
|
|
find_symbol_in_baseclass (struct type *parent_type, const char *name,
|
|
const struct block *block)
|
|
{
|
|
char *concatenated_name = NULL;
|
|
struct block_symbol sym;
|
|
struct cleanup *cleanup;
|
|
int i;
|
|
|
|
sym.symbol = NULL;
|
|
sym.block = NULL;
|
|
cleanup = make_cleanup (free_current_contents, &concatenated_name);
|
|
|
|
for (i = 0; i < TYPE_N_BASECLASSES (parent_type); ++i)
|
|
{
|
|
size_t len;
|
|
struct type *base_type = TYPE_BASECLASS (parent_type, i);
|
|
const char *base_name = TYPE_BASECLASS_NAME (parent_type, i);
|
|
|
|
if (base_name == NULL)
|
|
continue;
|
|
|
|
/* Search this particular base class. */
|
|
sym = d_lookup_symbol_in_module (base_name, name, block,
|
|
VAR_DOMAIN, 0);
|
|
if (sym.symbol != NULL)
|
|
break;
|
|
|
|
/* Now search all static file-level symbols. We have to do this for
|
|
things like typedefs in the class. First search in this symtab,
|
|
what we want is possibly there. */
|
|
len = strlen (base_name) + strlen (name) + 2;
|
|
concatenated_name = (char *) xrealloc (concatenated_name, len);
|
|
xsnprintf (concatenated_name, len, "%s.%s", base_name, name);
|
|
sym = lookup_symbol_in_static_block (concatenated_name, block,
|
|
VAR_DOMAIN);
|
|
if (sym.symbol != NULL)
|
|
break;
|
|
|
|
/* Nope. We now have to search all static blocks in all objfiles,
|
|
even if block != NULL, because there's no guarantees as to which
|
|
symtab the symbol we want is in. */
|
|
sym = lookup_static_symbol (concatenated_name, VAR_DOMAIN);
|
|
if (sym.symbol != NULL)
|
|
break;
|
|
|
|
/* If this class has base classes, search them next. */
|
|
base_type = check_typedef (base_type);
|
|
if (TYPE_N_BASECLASSES (base_type) > 0)
|
|
{
|
|
sym = find_symbol_in_baseclass (base_type, name, block);
|
|
if (sym.symbol != NULL)
|
|
break;
|
|
}
|
|
}
|
|
|
|
do_cleanups (cleanup);
|
|
return sym;
|
|
}
|
|
|
|
/* Look up a symbol named NESTED_NAME that is nested inside the D
|
|
class or module given by PARENT_TYPE, from within the context
|
|
given by BLOCK. Return NULL if there is no such nested type. */
|
|
|
|
struct block_symbol
|
|
d_lookup_nested_symbol (struct type *parent_type,
|
|
const char *nested_name,
|
|
const struct block *block)
|
|
{
|
|
/* type_name_no_tag_required provides better error reporting using the
|
|
original type. */
|
|
struct type *saved_parent_type = parent_type;
|
|
|
|
parent_type = check_typedef (parent_type);
|
|
|
|
switch (TYPE_CODE (parent_type))
|
|
{
|
|
case TYPE_CODE_STRUCT:
|
|
case TYPE_CODE_UNION:
|
|
case TYPE_CODE_ENUM:
|
|
case TYPE_CODE_MODULE:
|
|
{
|
|
int size;
|
|
const char *parent_name = type_name_no_tag_or_error (saved_parent_type);
|
|
struct block_symbol sym
|
|
= d_lookup_symbol_in_module (parent_name, nested_name,
|
|
block, VAR_DOMAIN, 0);
|
|
char *concatenated_name;
|
|
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
/* Now search all static file-level symbols. We have to do this
|
|
for things like typedefs in the class. We do not try to
|
|
guess any imported module as even the fully specified
|
|
module search is already not D compliant and more assumptions
|
|
could make it too magic. */
|
|
size = strlen (parent_name) + strlen (nested_name) + 2;
|
|
concatenated_name = (char *) alloca (size);
|
|
|
|
xsnprintf (concatenated_name, size, "%s.%s",
|
|
parent_name, nested_name);
|
|
|
|
sym = lookup_static_symbol (concatenated_name, VAR_DOMAIN);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
/* If no matching symbols were found, try searching any
|
|
base classes. */
|
|
return find_symbol_in_baseclass (parent_type, nested_name, block);
|
|
}
|
|
|
|
case TYPE_CODE_FUNC:
|
|
case TYPE_CODE_METHOD:
|
|
return (struct block_symbol) {NULL, NULL};
|
|
|
|
default:
|
|
gdb_assert_not_reached ("called with non-aggregate type.");
|
|
}
|
|
}
|
|
|
|
/* Used for cleanups to reset the "searched" flag incase
|
|
of an error. */
|
|
|
|
static void
|
|
reset_directive_searched (void *data)
|
|
{
|
|
struct using_direct *direct = data;
|
|
direct->searched = 0;
|
|
}
|
|
|
|
/* Search for NAME by applying all import statements belonging to
|
|
BLOCK which are applicable in SCOPE.
|
|
|
|
If SEARCH_PARENTS the search will include imports which are
|
|
applicable in parents of SCOPE.
|
|
Example:
|
|
|
|
module A;
|
|
import X;
|
|
void B() {
|
|
import Y;
|
|
}
|
|
|
|
If SCOPE is "A.B" and SEARCH_PARENTS is true, the imports of
|
|
modules X and Y will be considered. If SEARCH_PARENTS is false
|
|
only the import of Y is considered. */
|
|
|
|
static struct block_symbol
|
|
d_lookup_symbol_imports (const char *scope, const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain,
|
|
const int search_parents)
|
|
{
|
|
struct using_direct *current;
|
|
struct block_symbol sym;
|
|
int directive_match;
|
|
struct cleanup *searched_cleanup;
|
|
|
|
/* First, try to find the symbol in the given module. */
|
|
sym = d_lookup_symbol_in_module (scope, name, block, domain, 1);
|
|
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
/* Go through the using directives. If any of them add new names to
|
|
the module we're searching in, see if we can find a match by
|
|
applying them. */
|
|
|
|
for (current = block_using (block);
|
|
current != NULL;
|
|
current = current->next)
|
|
{
|
|
const char **excludep;
|
|
int len = strlen (current->import_dest);
|
|
|
|
directive_match = (search_parents
|
|
? (strncmp (scope, current->import_dest, len) == 0
|
|
&& (len == 0
|
|
|| scope[len] == '.'
|
|
|| scope[len] == '\0'))
|
|
: strcmp (scope, current->import_dest) == 0);
|
|
|
|
/* If the import destination is the current scope or one of its
|
|
ancestors then it is applicable. */
|
|
if (directive_match && !current->searched)
|
|
{
|
|
/* Mark this import as searched so that the recursive call
|
|
does not search it again. */
|
|
current->searched = 1;
|
|
searched_cleanup = make_cleanup (reset_directive_searched,
|
|
current);
|
|
|
|
/* If there is an import of a single declaration, compare the
|
|
imported declaration (after optional renaming by its alias)
|
|
with the sought out name. If there is a match pass
|
|
current->import_src as MODULE to direct the search towards
|
|
the imported module. */
|
|
if (current->declaration
|
|
&& strcmp (name, current->alias
|
|
? current->alias : current->declaration) == 0)
|
|
sym = d_lookup_symbol_in_module (current->import_src,
|
|
current->declaration,
|
|
block, domain, 1);
|
|
|
|
/* If a symbol was found or this import statement was an import
|
|
declaration, the search of this import is complete. */
|
|
if (sym.symbol != NULL || current->declaration)
|
|
{
|
|
current->searched = 0;
|
|
discard_cleanups (searched_cleanup);
|
|
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
continue;
|
|
}
|
|
|
|
/* Do not follow CURRENT if NAME matches its EXCLUDES. */
|
|
for (excludep = current->excludes; *excludep; excludep++)
|
|
if (strcmp (name, *excludep) == 0)
|
|
break;
|
|
if (*excludep)
|
|
{
|
|
discard_cleanups (searched_cleanup);
|
|
continue;
|
|
}
|
|
|
|
/* If the import statement is creating an alias. */
|
|
if (current->alias != NULL)
|
|
{
|
|
if (strcmp (name, current->alias) == 0)
|
|
{
|
|
/* If the alias matches the sought name. Pass
|
|
current->import_src as the NAME to direct the
|
|
search towards the aliased module. */
|
|
sym = lookup_module_scope (current->import_src, block,
|
|
domain, scope, 0);
|
|
}
|
|
else
|
|
{
|
|
/* If the alias matches the first component of the
|
|
sought name, pass current->import_src as MODULE
|
|
to direct the search, skipping over the aliased
|
|
component in NAME. */
|
|
int name_scope = d_find_first_component (name);
|
|
|
|
if (name[name_scope] != '\0'
|
|
&& strncmp (name, current->alias, name_scope) == 0)
|
|
{
|
|
/* Skip the '.' */
|
|
name_scope++;
|
|
sym = d_lookup_symbol_imports (current->import_src,
|
|
name + name_scope,
|
|
block, domain, 0);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* If this import statement creates no alias, pass
|
|
current->import_src as MODULE to direct the search
|
|
towards the imported module. */
|
|
sym = d_lookup_symbol_imports (current->import_src,
|
|
name, block, domain, 0);
|
|
}
|
|
current->searched = 0;
|
|
discard_cleanups (searched_cleanup);
|
|
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
}
|
|
}
|
|
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
|
|
/* Searches for NAME in the current module, and by applying relevant
|
|
import statements belonging to BLOCK and its parents. SCOPE is the
|
|
module scope of the context in which the search is being evaluated. */
|
|
|
|
static struct block_symbol
|
|
d_lookup_symbol_module (const char *scope, const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain)
|
|
{
|
|
struct block_symbol sym;
|
|
|
|
/* First, try to find the symbol in the given module. */
|
|
sym = d_lookup_symbol_in_module (scope, name,
|
|
block, domain, 1);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
/* Search for name in modules imported to this and parent
|
|
blocks. */
|
|
while (block != NULL)
|
|
{
|
|
sym = d_lookup_symbol_imports (scope, name, block, domain, 1);
|
|
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
}
|
|
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
|
|
/* The D-specific version of name lookup for static and global names
|
|
This makes sure that names get looked for in all modules that are
|
|
in scope. NAME is the natural name of the symbol that we're looking
|
|
looking for, BLOCK is the block that we're searching within, DOMAIN
|
|
says what kind of symbols we're looking for, and if SYMTAB is non-NULL,
|
|
we should store the symtab where we found the symbol in it. */
|
|
|
|
struct block_symbol
|
|
d_lookup_symbol_nonlocal (const struct language_defn *langdef,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain)
|
|
{
|
|
struct block_symbol sym;
|
|
const char *scope = block_scope (block);
|
|
|
|
sym = lookup_module_scope (name, block, domain, scope, 0);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
return d_lookup_symbol_module (scope, name, block, domain);
|
|
}
|
|
|