mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
9a3c826307
Note: I needed to split this patch in two, otherwise it's too big for the mailing list. This patch adds explicit casts to situations where a void pointer is assigned to a pointer to the "real" type. Building in C++ mode requires those assignments to use an explicit cast. This includes, for example: - callback arguments (cleanups, comparison functions, ...) - data attached to some object (objfile, program space, etc) in the form of a void pointer - "user data" passed to some function This patch comes from the commit "(mostly) auto-generated patch to insert casts needed for C++", taken from Pedro's C++ branch. Only files built on x86 with --enable-targets=all are modified, so the native files for other arches will need to be dealt with separately. I built-tested this with --enable-targets=all and reg-tested. To my surprise, a test case (selftest.exp) had to be adjusted. Here's the ChangeLog entry. Again, this was relatively quick to make despite the length, thanks to David Malcom's script, although I don't believe it's very useful information in that particular case... gdb/ChangeLog: * aarch64-tdep.c (aarch64_make_prologue_cache): Add cast(s). (aarch64_make_stub_cache): Likewise. (value_of_aarch64_user_reg): Likewise. * ada-lang.c (ada_inferior_data_cleanup): Likewise. (get_ada_inferior_data): Likewise. (get_ada_pspace_data): Likewise. (ada_pspace_data_cleanup): Likewise. (ada_complete_symbol_matcher): Likewise. (ada_exc_search_name_matches): Likewise. * ada-tasks.c (get_ada_tasks_pspace_data): Likewise. (get_ada_tasks_inferior_data): Likewise. * addrmap.c (addrmap_mutable_foreach_worker): Likewise. (splay_obstack_alloc): Likewise. (splay_obstack_free): Likewise. * alpha-linux-tdep.c (alpha_linux_supply_gregset): Likewise. (alpha_linux_collect_gregset): Likewise. (alpha_linux_supply_fpregset): Likewise. (alpha_linux_collect_fpregset): Likewise. * alpha-mdebug-tdep.c (alpha_mdebug_frame_unwind_cache): Likewise. * alpha-tdep.c (alpha_lds): Likewise. (alpha_sts): Likewise. (alpha_sigtramp_frame_unwind_cache): Likewise. (alpha_heuristic_frame_unwind_cache): Likewise. (alpha_supply_int_regs): Likewise. (alpha_fill_int_regs): Likewise. (alpha_supply_fp_regs): Likewise. (alpha_fill_fp_regs): Likewise. * alphanbsd-tdep.c (alphanbsd_supply_fpregset): Likewise. (alphanbsd_aout_supply_gregset): Likewise. (alphanbsd_supply_gregset): Likewise. * amd64-linux-tdep.c (amd64_linux_init_abi): Likewise. (amd64_x32_linux_init_abi): Likewise. * amd64-nat.c (amd64_supply_native_gregset): Likewise. (amd64_collect_native_gregset): Likewise. * amd64-tdep.c (amd64_frame_cache): Likewise. (amd64_sigtramp_frame_cache): Likewise. (amd64_epilogue_frame_cache): Likewise. (amd64_supply_fxsave): Likewise. (amd64_supply_xsave): Likewise. (amd64_collect_fxsave): Likewise. (amd64_collect_xsave): Likewise. * amd64-windows-tdep.c (amd64_windows_frame_cache): Likewise. * amd64obsd-tdep.c (amd64obsd_trapframe_cache): Likewise. * arm-linux-tdep.c (arm_linux_supply_gregset): Likewise. (arm_linux_collect_gregset): Likewise. (arm_linux_supply_nwfpe): Likewise. (arm_linux_collect_nwfpe): Likewise. (arm_linux_supply_vfp): Likewise. (arm_linux_collect_vfp): Likewise. * arm-tdep.c (arm_find_mapping_symbol): Likewise. (arm_prologue_unwind_stop_reason): Likewise. (arm_prologue_this_id): Likewise. (arm_prologue_prev_register): Likewise. (arm_exidx_data_free): Likewise. (arm_find_exidx_entry): Likewise. (arm_stub_this_id): Likewise. (arm_m_exception_this_id): Likewise. (arm_m_exception_prev_register): Likewise. (arm_normal_frame_base): Likewise. (gdb_print_insn_arm): Likewise. (arm_objfile_data_free): Likewise. (arm_record_special_symbol): Likewise. (value_of_arm_user_reg): Likewise. * armbsd-tdep.c (armbsd_supply_fpregset): Likewise. (armbsd_supply_gregset): Likewise. * auto-load.c (auto_load_pspace_data_cleanup): Likewise. (get_auto_load_pspace_data): Likewise. (hash_loaded_script_entry): Likewise. (eq_loaded_script_entry): Likewise. (clear_section_scripts): Likewise. (collect_matching_scripts): Likewise. * auxv.c (auxv_inferior_data_cleanup): Likewise. (get_auxv_inferior_data): Likewise. * avr-tdep.c (avr_frame_unwind_cache): Likewise. * ax-general.c (do_free_agent_expr_cleanup): Likewise. * bfd-target.c (target_bfd_xfer_partial): Likewise. (target_bfd_xclose): Likewise. (target_bfd_get_section_table): Likewise. * bfin-tdep.c (bfin_frame_cache): Likewise. * block.c (find_block_in_blockvector): Likewise. (call_site_for_pc): Likewise. (block_find_non_opaque_type_preferred): Likewise. * break-catch-sig.c (signal_catchpoint_insert_location): Likewise. (signal_catchpoint_remove_location): Likewise. (signal_catchpoint_breakpoint_hit): Likewise. (signal_catchpoint_print_one): Likewise. (signal_catchpoint_print_mention): Likewise. (signal_catchpoint_print_recreate): Likewise. * break-catch-syscall.c (get_catch_syscall_inferior_data): Likewise. * breakpoint.c (do_cleanup_counted_command_line): Likewise. (bp_location_compare_addrs): Likewise. (get_first_locp_gte_addr): Likewise. (check_tracepoint_command): Likewise. (do_map_commands_command): Likewise. (get_breakpoint_objfile_data): Likewise. (free_breakpoint_probes): Likewise. (do_captured_breakpoint_query): Likewise. (compare_breakpoints): Likewise. (bp_location_compare): Likewise. (bpstat_remove_breakpoint_callback): Likewise. (do_delete_breakpoint_cleanup): Likewise. * bsd-uthread.c (bsd_uthread_set_supply_uthread): Likewise. (bsd_uthread_set_collect_uthread): Likewise. (bsd_uthread_activate): Likewise. (bsd_uthread_fetch_registers): Likewise. (bsd_uthread_store_registers): Likewise. * btrace.c (check_xml_btrace_version): Likewise. (parse_xml_btrace_block): Likewise. (parse_xml_btrace_pt_config_cpu): Likewise. (parse_xml_btrace_pt_raw): Likewise. (parse_xml_btrace_pt): Likewise. (parse_xml_btrace_conf_bts): Likewise. (parse_xml_btrace_conf_pt): Likewise. (do_btrace_data_cleanup): Likewise. * c-typeprint.c (find_typedef_for_canonicalize): Likewise. * charset.c (cleanup_iconv): Likewise. (do_cleanup_iterator): Likewise. * cli-out.c (cli_uiout_dtor): Likewise. (cli_table_begin): Likewise. (cli_table_body): Likewise. (cli_table_end): Likewise. (cli_table_header): Likewise. (cli_begin): Likewise. (cli_end): Likewise. (cli_field_int): Likewise. (cli_field_skip): Likewise. (cli_field_string): Likewise. (cli_field_fmt): Likewise. (cli_spaces): Likewise. (cli_text): Likewise. (cli_message): Likewise. (cli_wrap_hint): Likewise. (cli_flush): Likewise. (cli_redirect): Likewise. (out_field_fmt): Likewise. (field_separator): Likewise. (cli_out_set_stream): Likewise. * cli/cli-cmds.c (compare_symtabs): Likewise. * cli/cli-dump.c (call_dump_func): Likewise. (restore_section_callback): Likewise. * cli/cli-script.c (clear_hook_in_cleanup): Likewise. (do_restore_user_call_depth): Likewise. (do_free_command_lines_cleanup): Likewise. * coff-pe-read.c (get_section_vmas): Likewise. (pe_as16): Likewise. (pe_as32): Likewise. * coffread.c (coff_symfile_read): Likewise. * common/agent.c (agent_look_up_symbols): Likewise. * common/filestuff.c (do_close_cleanup): Likewise. * common/format.c (free_format_pieces_cleanup): Likewise. * common/vec.c (vec_o_reserve): Likewise. * compile/compile-c-support.c (print_one_macro): Likewise. * compile/compile-c-symbols.c (hash_symbol_error): Likewise. (eq_symbol_error): Likewise. (del_symbol_error): Likewise. (error_symbol_once): Likewise. (gcc_convert_symbol): Likewise. (gcc_symbol_address): Likewise. (hash_symname): Likewise. (eq_symname): Likewise. * compile/compile-c-types.c (hash_type_map_instance): Likewise. (eq_type_map_instance): Likewise. (insert_type): Likewise. (convert_type): Likewise. * compile/compile-object-load.c (munmap_listp_free_cleanup): Likewise. (setup_sections): Likewise. (link_hash_table_free): Likewise. (copy_sections): Likewise. * compile/compile-object-run.c (do_module_cleanup): Likewise. * compile/compile.c (compile_print_value): Likewise. (do_rmdir): Likewise. (cleanup_compile_instance): Likewise. (cleanup_unlink_file): Likewise. * completer.c (free_completion_tracker): Likewise. * corelow.c (add_to_spuid_list): Likewise. * cp-namespace.c (reset_directive_searched): Likewise. * cp-support.c (reset_directive_searched): Likewise. * cris-tdep.c (cris_sigtramp_frame_unwind_cache): Likewise. (cris_frame_unwind_cache): Likewise. * d-lang.c (builtin_d_type): Likewise. * d-namespace.c (reset_directive_searched): Likewise. * dbxread.c (dbx_free_symfile_info): Likewise. (do_free_bincl_list_cleanup): Likewise. * disasm.c (hash_dis_line_entry): Likewise. (eq_dis_line_entry): Likewise. (dis_asm_print_address): Likewise. (fprintf_disasm): Likewise. (do_ui_file_delete): Likewise. * doublest.c (convert_floatformat_to_doublest): Likewise. * dummy-frame.c (pop_dummy_frame_bpt): Likewise. (dummy_frame_prev_register): Likewise. (dummy_frame_this_id): Likewise. * dwarf2-frame-tailcall.c (cache_hash): Likewise. (cache_eq): Likewise. (cache_find): Likewise. (tailcall_frame_this_id): Likewise. (dwarf2_tailcall_prev_register_first): Likewise. (tailcall_frame_prev_register): Likewise. (tailcall_frame_dealloc_cache): Likewise. (tailcall_frame_prev_arch): Likewise. * dwarf2-frame.c (dwarf2_frame_state_free): Likewise. (dwarf2_frame_set_init_reg): Likewise. (dwarf2_frame_init_reg): Likewise. (dwarf2_frame_set_signal_frame_p): Likewise. (dwarf2_frame_signal_frame_p): Likewise. (dwarf2_frame_set_adjust_regnum): Likewise. (dwarf2_frame_adjust_regnum): Likewise. (clear_pointer_cleanup): Likewise. (dwarf2_frame_cache): Likewise. (find_cie): Likewise. (dwarf2_frame_find_fde): Likewise. * dwarf2expr.c (dwarf_expr_address_type): Likewise. (free_dwarf_expr_context_cleanup): Likewise. * dwarf2loc.c (locexpr_find_frame_base_location): Likewise. (locexpr_get_frame_base): Likewise. (loclist_find_frame_base_location): Likewise. (loclist_get_frame_base): Likewise. (dwarf_expr_dwarf_call): Likewise. (dwarf_expr_get_base_type): Likewise. (dwarf_expr_push_dwarf_reg_entry_value): Likewise. (dwarf_expr_get_obj_addr): Likewise. (entry_data_value_coerce_ref): Likewise. (entry_data_value_copy_closure): Likewise. (entry_data_value_free_closure): Likewise. (get_frame_address_in_block_wrapper): Likewise. (dwarf2_evaluate_property): Likewise. (dwarf2_compile_property_to_c): Likewise. (needs_frame_read_addr_from_reg): Likewise. (needs_frame_get_reg_value): Likewise. (needs_frame_frame_base): Likewise. (needs_frame_frame_cfa): Likewise. (needs_frame_tls_address): Likewise. (needs_frame_dwarf_call): Likewise. (needs_dwarf_reg_entry_value): Likewise. (get_ax_pc): Likewise. (locexpr_read_variable): Likewise. (locexpr_read_variable_at_entry): Likewise. (locexpr_read_needs_frame): Likewise. (locexpr_describe_location): Likewise. (locexpr_tracepoint_var_ref): Likewise. (locexpr_generate_c_location): Likewise. (loclist_read_variable): Likewise. (loclist_read_variable_at_entry): Likewise. (loclist_describe_location): Likewise. (loclist_tracepoint_var_ref): Likewise. (loclist_generate_c_location): Likewise. * dwarf2read.c (line_header_hash_voidp): Likewise. (line_header_eq_voidp): Likewise. (dwarf2_has_info): Likewise. (dwarf2_get_section_info): Likewise. (locate_dwz_sections): Likewise. (hash_file_name_entry): Likewise. (eq_file_name_entry): Likewise. (delete_file_name_entry): Likewise. (dw2_setup): Likewise. (dw2_get_file_names_reader): Likewise. (dw2_find_pc_sect_compunit_symtab): Likewise. (hash_signatured_type): Likewise. (eq_signatured_type): Likewise. (add_signatured_type_cu_to_table): Likewise. (create_debug_types_hash_table): Likewise. (lookup_dwo_signatured_type): Likewise. (lookup_dwp_signatured_type): Likewise. (lookup_signatured_type): Likewise. (hash_type_unit_group): Likewise. (eq_type_unit_group): Likewise. (get_type_unit_group): Likewise. (process_psymtab_comp_unit_reader): Likewise. (sort_tu_by_abbrev_offset): Likewise. (process_skeletonless_type_unit): Likewise. (psymtabs_addrmap_cleanup): Likewise. (dwarf2_read_symtab): Likewise. (psymtab_to_symtab_1): Likewise. (die_hash): Likewise. (die_eq): Likewise. (load_full_comp_unit_reader): Likewise. (reset_die_in_process): Likewise. (free_cu_line_header): Likewise. (handle_DW_AT_stmt_list): Likewise. (hash_dwo_file): Likewise. (eq_dwo_file): Likewise. (hash_dwo_unit): Likewise. (eq_dwo_unit): Likewise. (create_dwo_cu_reader): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (lookup_dwo_unit_in_dwp): Likewise. (dwarf2_locate_dwo_sections): Likewise. (dwarf2_locate_common_dwp_sections): Likewise. (dwarf2_locate_v2_dwp_sections): Likewise. (hash_dwp_loaded_cutus): Likewise. (eq_dwp_loaded_cutus): Likewise. (lookup_dwo_cutu): Likewise. (abbrev_table_free_cleanup): Likewise. (dwarf2_free_abbrev_table): Likewise. (find_partial_die_in_comp_unit): Likewise. (free_line_header_voidp): Likewise. (follow_die_offset): Likewise. (follow_die_sig_1): Likewise. (free_heap_comp_unit): Likewise. (free_stack_comp_unit): Likewise. (dwarf2_free_objfile): Likewise. (per_cu_offset_and_type_hash): Likewise. (per_cu_offset_and_type_eq): Likewise. (get_die_type_at_offset): Likewise. (partial_die_hash): Likewise. (partial_die_eq): Likewise. (dwarf2_per_objfile_free): Likewise. (hash_strtab_entry): Likewise. (eq_strtab_entry): Likewise. (add_string): Likewise. (hash_symtab_entry): Likewise. (eq_symtab_entry): Likewise. (delete_symtab_entry): Likewise. (cleanup_mapped_symtab): Likewise. (add_indices_to_cpool): Likewise. (hash_psymtab_cu_index): Likewise. (eq_psymtab_cu_index): Likewise. (add_address_entry_worker): Likewise. (unlink_if_set): Likewise. (write_one_signatured_type): Likewise. (save_gdb_index_command): Likewise. * elfread.c (elf_symtab_read): Likewise. (elf_gnu_ifunc_cache_hash): Likewise. (elf_gnu_ifunc_cache_eq): Likewise. (elf_gnu_ifunc_record_cache): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_get_probes): Likewise. (probe_key_free): Likewise. * f-lang.c (builtin_f_type): Likewise. * frame-base.c (frame_base_append_sniffer): Likewise. (frame_base_set_default): Likewise. (frame_base_find_by_frame): Likewise. * frame-unwind.c (frame_unwind_prepend_unwinder): Likewise. (frame_unwind_append_unwinder): Likewise. (frame_unwind_find_by_frame): Likewise. * frame.c (frame_addr_hash): Likewise. (frame_addr_hash_eq): Likewise. (frame_stash_find): Likewise. (do_frame_register_read): Likewise. (unwind_to_current_frame): Likewise. (frame_cleanup_after_sniffer): Likewise. * frv-linux-tdep.c (frv_linux_sigtramp_frame_cache): Likewise. * frv-tdep.c (frv_frame_unwind_cache): Likewise. * ft32-tdep.c (ft32_frame_cache): Likewise. * gcore.c (do_bfd_delete_cleanup): Likewise. (gcore_create_callback): Likewise. * gdb_bfd.c (hash_bfd): Likewise. (eq_bfd): Likewise. (gdb_bfd_open): Likewise. (free_one_bfd_section): Likewise. (gdb_bfd_ref): Likewise. (gdb_bfd_unref): Likewise. (get_section_descriptor): Likewise. (gdb_bfd_map_section): Likewise. (gdb_bfd_crc): Likewise. (gdb_bfd_mark_parent): Likewise. (gdb_bfd_record_inclusion): Likewise. (gdb_bfd_requires_relocations): Likewise. (print_one_bfd): Likewise. * gdbtypes.c (type_pair_hash): Likewise. (type_pair_eq): Likewise. (builtin_type): Likewise. (objfile_type): Likewise. * gnu-v3-abi.c (vtable_ptrdiff_type): Likewise. (vtable_address_point_offset): Likewise. (gnuv3_get_vtable): Likewise. (hash_value_and_voffset): Likewise. (eq_value_and_voffset): Likewise. (compare_value_and_voffset): Likewise. (compute_vtable_size): Likewise. (gnuv3_get_typeid_type): Likewise. * go-lang.c (builtin_go_type): Likewise. * guile/scm-block.c (bkscm_hash_block_smob): Likewise. (bkscm_eq_block_smob): Likewise. (bkscm_objfile_block_map): Likewise. (bkscm_del_objfile_blocks): Likewise. * guile/scm-breakpoint.c (bpscm_build_bp_list): Likewise. * guile/scm-disasm.c (gdbscm_disasm_read_memory_worker): Likewise. (gdbscm_disasm_print_address): Likewise. * guile/scm-frame.c (frscm_hash_frame_smob): Likewise. (frscm_eq_frame_smob): Likewise. (frscm_inferior_frame_map): Likewise. (frscm_del_inferior_frames): Likewise. * guile/scm-gsmob.c (gdbscm_add_objfile_ref): Likewise. * guile/scm-objfile.c (ofscm_handle_objfile_deleted): Likewise. (ofscm_objfile_smob_from_objfile): Likewise. * guile/scm-ports.c (ioscm_write): Likewise. (ioscm_file_port_delete): Likewise. (ioscm_file_port_rewind): Likewise. (ioscm_file_port_put): Likewise. (ioscm_file_port_write): Likewise. * guile/scm-progspace.c (psscm_handle_pspace_deleted): Likewise. (psscm_pspace_smob_from_pspace): Likewise. * guile/scm-safe-call.c (scscm_recording_pre_unwind_handler): Likewise. (scscm_recording_unwind_handler): Likewise. (gdbscm_with_catch): Likewise. (scscm_call_0_body): Likewise. (scscm_call_1_body): Likewise. (scscm_call_2_body): Likewise. (scscm_call_3_body): Likewise. (scscm_call_4_body): Likewise. (scscm_apply_1_body): Likewise. (scscm_eval_scheme_string): Likewise. (gdbscm_safe_eval_string): Likewise. (scscm_source_scheme_script): Likewise. (gdbscm_safe_source_script): Likewise. * guile/scm-string.c (gdbscm_call_scm_to_stringn): Likewise. (gdbscm_call_scm_from_stringn): Likewise. * guile/scm-symbol.c (syscm_hash_symbol_smob): Likewise. (syscm_eq_symbol_smob): Likewise. (syscm_get_symbol_map): Likewise. (syscm_del_objfile_symbols): Likewise. * guile/scm-symtab.c (stscm_hash_symtab_smob): Likewise. (stscm_eq_symtab_smob): Likewise. (stscm_objfile_symtab_map): Likewise. (stscm_del_objfile_symtabs): Likewise. * guile/scm-type.c (tyscm_hash_type_smob): Likewise. (tyscm_eq_type_smob): Likewise. (tyscm_type_map): Likewise. (tyscm_copy_type_recursive): Likewise. (save_objfile_types): Likewise. * guile/scm-utils.c (extract_arg): Likewise. * h8300-tdep.c (h8300_frame_cache): Likewise. * hppa-linux-tdep.c (hppa_linux_sigtramp_frame_unwind_cache): Likewise. * hppa-tdep.c (compare_unwind_entries): Likewise. (find_unwind_entry): Likewise. (hppa_frame_cache): Likewise. (hppa_stub_frame_unwind_cache): Likewise. * hppanbsd-tdep.c (hppanbsd_supply_gregset): Likewise. * hppaobsd-tdep.c (hppaobsd_supply_gregset): Likewise. (hppaobsd_supply_fpregset): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. * i386-linux-tdep.c (i386_linux_init_abi): Likewise. * i386-tdep.c (i386_frame_cache): Likewise. (i386_epilogue_frame_cache): Likewise. (i386_sigtramp_frame_cache): Likewise. (i386_supply_gregset): Likewise. (i386_collect_gregset): Likewise. (i386_gdbarch_init): Likewise. * i386obsd-tdep.c (i386obsd_aout_supply_regset): Likewise. (i386obsd_trapframe_cache): Likewise. * i387-tdep.c (i387_supply_fsave): Likewise. (i387_collect_fsave): Likewise. (i387_supply_fxsave): Likewise. (i387_collect_fxsave): Likewise. (i387_supply_xsave): Likewise. (i387_collect_xsave): Likewise. * ia64-tdep.c (ia64_frame_cache): Likewise. (ia64_sigtramp_frame_cache): Likewise. * infcmd.c (attach_command_continuation): Likewise. (attach_command_continuation_free_args): Likewise. * inferior.c (restore_inferior): Likewise. (delete_thread_of_inferior): Likewise. * inflow.c (inflow_inferior_data_cleanup): Likewise. (get_inflow_inferior_data): Likewise. (inflow_inferior_exit): Likewise. * infrun.c (displaced_step_clear_cleanup): Likewise. (restore_current_uiout_cleanup): Likewise. (release_stop_context_cleanup): Likewise. (do_restore_infcall_suspend_state_cleanup): Likewise. (do_restore_infcall_control_state_cleanup): Likewise. (restore_inferior_ptid): Likewise. * inline-frame.c (block_starting_point_at): Likewise. * iq2000-tdep.c (iq2000_frame_cache): Likewise. * jit.c (get_jit_objfile_data): Likewise. (get_jit_program_space_data): Likewise. (jit_object_close_impl): Likewise. (jit_find_objf_with_entry_addr): Likewise. (jit_breakpoint_deleted): Likewise. (jit_unwind_reg_set_impl): Likewise. (jit_unwind_reg_get_impl): Likewise. (jit_dealloc_cache): Likewise. (jit_frame_sniffer): Likewise. (jit_frame_prev_register): Likewise. (jit_prepend_unwinder): Likewise. (jit_inferior_exit_hook): Likewise. (free_objfile_data): Likewise. * jv-lang.c (jv_per_objfile_free): Likewise. (get_dynamics_objfile): Likewise. (get_java_class_symtab): Likewise. (builtin_java_type): Likewise. * language.c (language_string_char_type): Likewise. (language_bool_type): Likewise. (language_lookup_primitive_type): Likewise. (language_lookup_primitive_type_as_symbol): Likewise. * linespec.c (hash_address_entry): Likewise. (eq_address_entry): Likewise. (iterate_inline_only): Likewise. (iterate_name_matcher): Likewise. (decode_line_2_compare_items): Likewise. (collect_one_symbol): Likewise. (compare_symbols): Likewise. (compare_msymbols): Likewise. (add_symtabs_to_list): Likewise. (collect_symbols): Likewise. (compare_msyms): Likewise. (add_minsym): Likewise. (cleanup_linespec_result): Likewise. * linux-fork.c (inferior_call_waitpid_cleanup): Likewise. * linux-nat.c (delete_lwp_cleanup): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (resume_stopped_resumed_lwps): Likewise. * linux-tdep.c (get_linux_gdbarch_data): Likewise. (invalidate_linux_cache_inf): Likewise. (get_linux_inferior_data): Likewise. (linux_find_memory_regions_thunk): Likewise. (linux_make_mappings_callback): Likewise. (linux_corefile_thread_callback): Likewise. (find_mapping_size): Likewise. * linux-thread-db.c (find_new_threads_callback): Likewise. * lm32-tdep.c (lm32_frame_cache): Likewise. * m2-lang.c (builtin_m2_type): Likewise. * m32c-tdep.c (m32c_analyze_frame_prologue): Likewise. * m32r-linux-tdep.c (m32r_linux_sigtramp_frame_cache): Likewise. (m32r_linux_supply_gregset): Likewise. (m32r_linux_collect_gregset): Likewise. * m32r-tdep.c (m32r_frame_unwind_cache): Likewise. * m68hc11-tdep.c (m68hc11_frame_unwind_cache): Likewise. * m68k-tdep.c (m68k_frame_cache): Likewise. * m68kbsd-tdep.c (m68kbsd_supply_fpregset): Likewise. (m68kbsd_supply_gregset): Likewise. * m68klinux-tdep.c (m68k_linux_sigtramp_frame_cache): Likewise. * m88k-tdep.c (m88k_frame_cache): Likewise. (m88k_supply_gregset): Likewise. gdb/gdbserver/ChangeLog: * dll.c (match_dll): Add cast(s). (unloaded_dll): Likewise. * linux-low.c (second_thread_of_pid_p): Likewise. (delete_lwp_callback): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (linux_set_resume_request): Likewise. * server.c (accumulate_file_name_length): Likewise. (emit_dll_description): Likewise. (handle_qxfer_threads_worker): Likewise. (visit_actioned_threads): Likewise. * thread-db.c (any_thread_of): Likewise. * tracepoint.c (same_process_p): Likewise. (match_blocktype): Likewise. (build_traceframe_info_xml): Likewise. gdb/testsuite/ChangeLog: * gdb.gdb/selftest.exp (do_steps_and_nexts): Adjust expected source line.
1110 lines
34 KiB
C
1110 lines
34 KiB
C
/* Helper routines for C++ support in GDB.
|
|
Copyright (C) 2003-2015 Free Software Foundation, Inc.
|
|
|
|
Contributed by David Carlton and by Kealia, 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 "cp-support.h"
|
|
#include "gdb_obstack.h"
|
|
#include "symtab.h"
|
|
#include "symfile.h"
|
|
#include "block.h"
|
|
#include "objfiles.h"
|
|
#include "gdbtypes.h"
|
|
#include "dictionary.h"
|
|
#include "command.h"
|
|
#include "frame.h"
|
|
#include "buildsym.h"
|
|
#include "language.h"
|
|
#include "namespace.h"
|
|
|
|
static struct block_symbol
|
|
cp_lookup_nested_symbol_1 (struct type *container_type,
|
|
const char *nested_name,
|
|
const char *concatenated_name,
|
|
const struct block *block,
|
|
const domain_enum domain,
|
|
int basic_lookup, int is_in_anonymous);
|
|
|
|
static struct type *cp_lookup_transparent_type_loop (const char *name,
|
|
const char *scope,
|
|
int scope_len);
|
|
|
|
/* Check to see if SYMBOL refers to an object contained within an
|
|
anonymous namespace; if so, add an appropriate using directive. */
|
|
|
|
void
|
|
cp_scan_for_anonymous_namespaces (const struct symbol *const symbol,
|
|
struct objfile *const objfile)
|
|
{
|
|
if (SYMBOL_DEMANGLED_NAME (symbol) != NULL)
|
|
{
|
|
const char *name = SYMBOL_DEMANGLED_NAME (symbol);
|
|
unsigned int previous_component;
|
|
unsigned int next_component;
|
|
|
|
/* Start with a quick-and-dirty check for mention of "(anonymous
|
|
namespace)". */
|
|
|
|
if (!cp_is_in_anonymous (name))
|
|
return;
|
|
|
|
previous_component = 0;
|
|
next_component = cp_find_first_component (name + previous_component);
|
|
|
|
while (name[next_component] == ':')
|
|
{
|
|
if (((next_component - previous_component)
|
|
== CP_ANONYMOUS_NAMESPACE_LEN)
|
|
&& strncmp (name + previous_component,
|
|
CP_ANONYMOUS_NAMESPACE_STR,
|
|
CP_ANONYMOUS_NAMESPACE_LEN) == 0)
|
|
{
|
|
int dest_len = (previous_component == 0
|
|
? 0 : previous_component - 2);
|
|
int src_len = next_component;
|
|
|
|
char *dest = (char *) alloca (dest_len + 1);
|
|
char *src = (char *) alloca (src_len + 1);
|
|
|
|
memcpy (dest, name, dest_len);
|
|
memcpy (src, name, src_len);
|
|
|
|
dest[dest_len] = '\0';
|
|
src[src_len] = '\0';
|
|
|
|
/* We've found a component of the name that's an
|
|
anonymous namespace. So add symbols in it to the
|
|
namespace given by the previous component if there is
|
|
one, or to the global namespace if there isn't. */
|
|
add_using_directive (&local_using_directives,
|
|
dest, src, NULL, NULL, NULL, 1,
|
|
&objfile->objfile_obstack);
|
|
}
|
|
/* The "+ 2" is for the "::". */
|
|
previous_component = next_component + 2;
|
|
next_component = (previous_component
|
|
+ cp_find_first_component (name
|
|
+ previous_component));
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Test whether or not NAMESPACE looks like it mentions an anonymous
|
|
namespace; return nonzero if so. */
|
|
|
|
int
|
|
cp_is_in_anonymous (const char *symbol_name)
|
|
{
|
|
return (strstr (symbol_name, CP_ANONYMOUS_NAMESPACE_STR)
|
|
!= NULL);
|
|
}
|
|
|
|
/* Look up NAME in DOMAIN in BLOCK's static block and in global blocks.
|
|
If IS_IN_ANONYMOUS is nonzero, the symbol in question is located
|
|
within an anonymous namespace. */
|
|
|
|
static struct block_symbol
|
|
cp_basic_lookup_symbol (const char *name, const struct block *block,
|
|
const domain_enum domain, int is_in_anonymous)
|
|
{
|
|
struct block_symbol sym;
|
|
|
|
sym = lookup_symbol_in_static_block (name, block, domain);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
if (is_in_anonymous)
|
|
{
|
|
/* Symbols defined in anonymous namespaces have external linkage
|
|
but should be treated as local to a single file nonetheless.
|
|
So we only search the current file's global block. */
|
|
|
|
const struct block *global_block = block_global_block (block);
|
|
|
|
if (global_block != NULL)
|
|
{
|
|
sym.symbol = lookup_symbol_in_block (name, global_block, domain);
|
|
sym.block = global_block;
|
|
}
|
|
}
|
|
else
|
|
sym = lookup_global_symbol (name, block, domain);
|
|
|
|
return sym;
|
|
}
|
|
|
|
/* Search bare symbol NAME in DOMAIN in BLOCK.
|
|
NAME is guaranteed to not have any scope (no "::") in its name, though
|
|
if for example NAME is a template spec then "::" may appear in the
|
|
argument list.
|
|
If LANGDEF is non-NULL then try to lookup NAME as a primitive type in
|
|
that language. Normally we wouldn't need LANGDEF but fortran also uses
|
|
this code.
|
|
If SEARCH is non-zero then see if we can determine "this" from BLOCK, and
|
|
if so then also search for NAME in that class. */
|
|
|
|
static struct block_symbol
|
|
cp_lookup_bare_symbol (const struct language_defn *langdef,
|
|
const char *name, const struct block *block,
|
|
const domain_enum domain, int search)
|
|
{
|
|
struct block_symbol sym;
|
|
|
|
/* Note: We can't do a simple assert for ':' not being in NAME because
|
|
':' may be in the args of a template spec. This isn't intended to be
|
|
a complete test, just cheap and documentary. */
|
|
if (strchr (name, '<') == NULL && strchr (name, '(') == NULL)
|
|
gdb_assert (strchr (name, ':') == NULL);
|
|
|
|
sym = lookup_symbol_in_static_block (name, block, domain);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
/* If we didn't find a definition for a builtin type in the static block,
|
|
search for it now. This is actually the right thing to do and can be
|
|
a massive performance win. E.g., when debugging a program with lots of
|
|
shared libraries we could search all of them only to find out the
|
|
builtin type isn't defined in any of them. This is common for types
|
|
like "void". */
|
|
if (langdef != NULL && domain == VAR_DOMAIN)
|
|
{
|
|
struct gdbarch *gdbarch;
|
|
|
|
if (block == NULL)
|
|
gdbarch = target_gdbarch ();
|
|
else
|
|
gdbarch = block_gdbarch (block);
|
|
sym.symbol
|
|
= language_lookup_primitive_type_as_symbol (langdef, gdbarch, name);
|
|
sym.block = NULL;
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
}
|
|
|
|
sym = lookup_global_symbol (name, block, domain);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
if (search)
|
|
{
|
|
struct block_symbol lang_this;
|
|
struct type *type;
|
|
|
|
lang_this = lookup_language_this (language_def (language_cplus), block);
|
|
if (lang_this.symbol == NULL)
|
|
return (struct block_symbol) {NULL, NULL};
|
|
|
|
type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (lang_this.symbol)));
|
|
/* If TYPE_NAME is NULL, abandon trying to find this symbol.
|
|
This can happen for lambda functions compiled with clang++,
|
|
which outputs no name for the container class. */
|
|
if (TYPE_NAME (type) == NULL)
|
|
return (struct block_symbol) {NULL, NULL};
|
|
|
|
/* Look for symbol NAME in this class. */
|
|
sym = cp_lookup_nested_symbol (type, name, block, domain);
|
|
}
|
|
|
|
return sym;
|
|
}
|
|
|
|
/* Search NAME in DOMAIN in all static blocks, and then in all baseclasses.
|
|
BLOCK specifies the context in which to perform the search.
|
|
NAME is guaranteed to have scope (contain "::") and PREFIX_LEN specifies
|
|
the length of the entire scope of NAME (up to, but not including, the last
|
|
"::".
|
|
|
|
Note: At least in the case of Fortran, which also uses this code, there
|
|
may be no text after the last "::". */
|
|
|
|
static struct block_symbol
|
|
cp_search_static_and_baseclasses (const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain,
|
|
unsigned int prefix_len,
|
|
int is_in_anonymous)
|
|
{
|
|
struct block_symbol sym;
|
|
char *klass, *nested;
|
|
struct cleanup *cleanup;
|
|
struct block_symbol klass_sym;
|
|
struct type *klass_type;
|
|
|
|
/* The test here uses <= instead of < because Fortran also uses this,
|
|
and the module.exp testcase will pass "modmany::" for NAME here. */
|
|
gdb_assert (prefix_len + 2 <= strlen (name));
|
|
gdb_assert (name[prefix_len + 1] == ':');
|
|
|
|
/* Find the name of the class and the name of the method, variable, etc. */
|
|
|
|
/* The class name is everything up to and including PREFIX_LEN. */
|
|
klass = savestring (name, prefix_len);
|
|
|
|
/* The rest of the name is everything else past the initial scope
|
|
operator. */
|
|
nested = xstrdup (name + prefix_len + 2);
|
|
|
|
/* Add cleanups to free memory for these strings. */
|
|
cleanup = make_cleanup (xfree, klass);
|
|
make_cleanup (xfree, nested);
|
|
|
|
/* Lookup a class named KLASS. If none is found, there is nothing
|
|
more that can be done. KLASS could be a namespace, so always look
|
|
in VAR_DOMAIN. This works for classes too because of
|
|
symbol_matches_domain (which should be replaced with something else,
|
|
but it's what we have today). */
|
|
klass_sym = lookup_global_symbol (klass, block, VAR_DOMAIN);
|
|
if (klass_sym.symbol == NULL)
|
|
{
|
|
do_cleanups (cleanup);
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
klass_type = SYMBOL_TYPE (klass_sym.symbol);
|
|
|
|
/* Look for a symbol named NESTED in this class.
|
|
The caller is assumed to have already have done a basic lookup of NAME.
|
|
So we pass zero for BASIC_LOOKUP to cp_lookup_nested_symbol_1 here. */
|
|
sym = cp_lookup_nested_symbol_1 (klass_type, nested, name, block, domain,
|
|
0, is_in_anonymous);
|
|
|
|
do_cleanups (cleanup);
|
|
return sym;
|
|
}
|
|
|
|
/* Look up NAME in the C++ namespace NAMESPACE. Other arguments are
|
|
as in cp_lookup_symbol_nonlocal. If SEARCH is non-zero, search
|
|
through base classes for a matching symbol.
|
|
|
|
Note: Part of the complexity is because NAME may itself specify scope.
|
|
Part of the complexity is also because this handles the case where
|
|
there is no scoping in which case we also try looking in the class of
|
|
"this" if we can compute it. */
|
|
|
|
static struct block_symbol
|
|
cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain, int search)
|
|
{
|
|
char *concatenated_name = NULL;
|
|
int is_in_anonymous;
|
|
unsigned int prefix_len;
|
|
struct block_symbol sym;
|
|
|
|
if (the_namespace[0] != '\0')
|
|
{
|
|
concatenated_name
|
|
= (char *) alloca (strlen (the_namespace) + 2 + strlen (name) + 1);
|
|
strcpy (concatenated_name, the_namespace);
|
|
strcat (concatenated_name, "::");
|
|
strcat (concatenated_name, name);
|
|
name = concatenated_name;
|
|
}
|
|
|
|
prefix_len = cp_entire_prefix_len (name);
|
|
if (prefix_len == 0)
|
|
return cp_lookup_bare_symbol (NULL, name, block, domain, search);
|
|
|
|
/* This would be simpler if we just called cp_lookup_nested_symbol
|
|
at this point. But that would require first looking up the containing
|
|
class/namespace. Since we're only searching static and global blocks
|
|
there's often no need to first do that lookup. */
|
|
|
|
is_in_anonymous
|
|
= the_namespace[0] != '\0' && cp_is_in_anonymous (the_namespace);
|
|
sym = cp_basic_lookup_symbol (name, block, domain, is_in_anonymous);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
if (search)
|
|
sym = cp_search_static_and_baseclasses (name, block, domain, prefix_len,
|
|
is_in_anonymous);
|
|
|
|
return sym;
|
|
}
|
|
|
|
/* Used for cleanups to reset the "searched" flag in case of an error. */
|
|
|
|
static void
|
|
reset_directive_searched (void *data)
|
|
{
|
|
struct using_direct *direct = (struct using_direct *) data;
|
|
direct->searched = 0;
|
|
}
|
|
|
|
/* Search for NAME by applying all import statements belonging to
|
|
BLOCK which are applicable in SCOPE. If DECLARATION_ONLY the
|
|
search is restricted to using declarations.
|
|
Example:
|
|
|
|
namespace A {
|
|
int x;
|
|
}
|
|
using A::x;
|
|
|
|
If SEARCH_PARENTS the search will include imports which are
|
|
applicable in parents of SCOPE.
|
|
Example:
|
|
|
|
namespace A {
|
|
using namespace X;
|
|
namespace B {
|
|
using namespace Y;
|
|
}
|
|
}
|
|
|
|
If SCOPE is "A::B" and SEARCH_PARENTS is true the imports of
|
|
namespaces X and Y will be considered. If SEARCH_PARENTS is false
|
|
only the import of Y is considered.
|
|
|
|
SEARCH_SCOPE_FIRST is an internal implementation detail: Callers must
|
|
pass 0 for it. Internally we pass 1 when recursing. */
|
|
|
|
static struct block_symbol
|
|
cp_lookup_symbol_via_imports (const char *scope,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain,
|
|
const int search_scope_first,
|
|
const int declaration_only,
|
|
const int search_parents)
|
|
{
|
|
struct using_direct *current;
|
|
struct block_symbol sym;
|
|
int len;
|
|
int directive_match;
|
|
struct cleanup *searched_cleanup;
|
|
|
|
sym.symbol = NULL;
|
|
sym.block = NULL;
|
|
|
|
/* First, try to find the symbol in the given namespace if requested. */
|
|
if (search_scope_first)
|
|
sym = cp_lookup_symbol_in_namespace (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 namespace 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;
|
|
|
|
len = strlen (current->import_dest);
|
|
directive_match = (search_parents
|
|
? (startswith (scope, current->import_dest)
|
|
&& (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 NAMESPACE to direct the search
|
|
towards the imported namespace. */
|
|
if (current->declaration
|
|
&& strcmp (name, current->alias
|
|
? current->alias : current->declaration) == 0)
|
|
sym = cp_lookup_symbol_in_namespace (current->import_src,
|
|
current->declaration,
|
|
block, domain, 1);
|
|
|
|
/* If this is a DECLARATION_ONLY search or a symbol was found
|
|
or this import statement was an import declaration, the
|
|
search of this import is complete. */
|
|
if (declaration_only || 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 (current->alias != NULL
|
|
&& strcmp (name, current->alias) == 0)
|
|
/* If the import is creating an alias and the alias matches
|
|
the sought name. Pass current->import_src as the NAME to
|
|
direct the search towards the aliased namespace. */
|
|
{
|
|
sym = cp_lookup_symbol_in_namespace (scope,
|
|
current->import_src,
|
|
block, domain, 1);
|
|
}
|
|
else if (current->alias == NULL)
|
|
{
|
|
/* If this import statement creates no alias, pass
|
|
current->inner as NAMESPACE to direct the search
|
|
towards the imported namespace. */
|
|
sym = cp_lookup_symbol_via_imports (current->import_src,
|
|
name, block,
|
|
domain, 1, 0, 0);
|
|
}
|
|
current->searched = 0;
|
|
discard_cleanups (searched_cleanup);
|
|
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
}
|
|
}
|
|
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
|
|
/* Helper function that searches an array of symbols for one named NAME. */
|
|
|
|
static struct symbol *
|
|
search_symbol_list (const char *name, int num,
|
|
struct symbol **syms)
|
|
{
|
|
int i;
|
|
|
|
/* Maybe we should store a dictionary in here instead. */
|
|
for (i = 0; i < num; ++i)
|
|
{
|
|
if (strcmp (name, SYMBOL_NATURAL_NAME (syms[i])) == 0)
|
|
return syms[i];
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/* Like cp_lookup_symbol_via_imports, but if BLOCK is a function, it
|
|
searches through the template parameters of the function and the
|
|
function's type. */
|
|
|
|
struct block_symbol
|
|
cp_lookup_symbol_imports_or_template (const char *scope,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain)
|
|
{
|
|
struct symbol *function = BLOCK_FUNCTION (block);
|
|
struct block_symbol result;
|
|
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_symbol_imports_or_template"
|
|
" (%s, %s, %s, %s)\n",
|
|
scope, name, host_address_to_string (block),
|
|
domain_name (domain));
|
|
}
|
|
|
|
if (function != NULL && SYMBOL_LANGUAGE (function) == language_cplus)
|
|
{
|
|
/* Search the function's template parameters. */
|
|
if (SYMBOL_IS_CPLUS_TEMPLATE_FUNCTION (function))
|
|
{
|
|
struct template_symbol *templ
|
|
= (struct template_symbol *) function;
|
|
struct symbol *sym = search_symbol_list (name,
|
|
templ->n_template_arguments,
|
|
templ->template_arguments);
|
|
|
|
if (sym != NULL)
|
|
{
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_symbol_imports_or_template"
|
|
" (...) = %s\n",
|
|
host_address_to_string (sym));
|
|
}
|
|
return (struct block_symbol) {sym, block};
|
|
}
|
|
}
|
|
|
|
/* Search the template parameters of the function's defining
|
|
context. */
|
|
if (SYMBOL_NATURAL_NAME (function))
|
|
{
|
|
struct type *context;
|
|
char *name_copy = xstrdup (SYMBOL_NATURAL_NAME (function));
|
|
struct cleanup *cleanups = make_cleanup (xfree, name_copy);
|
|
const struct language_defn *lang = language_def (language_cplus);
|
|
struct gdbarch *arch = symbol_arch (function);
|
|
const struct block *parent = BLOCK_SUPERBLOCK (block);
|
|
struct symbol *sym;
|
|
|
|
while (1)
|
|
{
|
|
unsigned int prefix_len = cp_entire_prefix_len (name_copy);
|
|
|
|
if (prefix_len == 0)
|
|
context = NULL;
|
|
else
|
|
{
|
|
name_copy[prefix_len] = '\0';
|
|
context = lookup_typename (lang, arch,
|
|
name_copy,
|
|
parent, 1);
|
|
}
|
|
|
|
if (context == NULL)
|
|
break;
|
|
|
|
sym
|
|
= search_symbol_list (name,
|
|
TYPE_N_TEMPLATE_ARGUMENTS (context),
|
|
TYPE_TEMPLATE_ARGUMENTS (context));
|
|
if (sym != NULL)
|
|
{
|
|
do_cleanups (cleanups);
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered
|
|
(gdb_stdlog,
|
|
"cp_lookup_symbol_imports_or_template (...) = %s\n",
|
|
host_address_to_string (sym));
|
|
}
|
|
return (struct block_symbol) {sym, parent};
|
|
}
|
|
}
|
|
|
|
do_cleanups (cleanups);
|
|
}
|
|
}
|
|
|
|
result = cp_lookup_symbol_via_imports (scope, name, block, domain, 0, 1, 1);
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_symbol_imports_or_template (...) = %s\n",
|
|
result.symbol != NULL
|
|
? host_address_to_string (result.symbol) : "NULL");
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Search for NAME by applying relevant import statements belonging to BLOCK
|
|
and its parents. SCOPE is the namespace scope of the context in which the
|
|
search is being evaluated. */
|
|
|
|
static struct block_symbol
|
|
cp_lookup_symbol_via_all_imports (const char *scope, const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain)
|
|
{
|
|
struct block_symbol sym;
|
|
|
|
while (block != NULL)
|
|
{
|
|
sym = cp_lookup_symbol_via_imports (scope, name, block, domain, 0, 0, 1);
|
|
if (sym.symbol)
|
|
return sym;
|
|
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
}
|
|
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
|
|
/* Searches for NAME in the current namespace, and by applying
|
|
relevant import statements belonging to BLOCK and its parents.
|
|
SCOPE is the namespace scope of the context in which the search is
|
|
being evaluated. */
|
|
|
|
struct block_symbol
|
|
cp_lookup_symbol_namespace (const char *scope,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain)
|
|
{
|
|
struct block_symbol sym;
|
|
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_symbol_namespace (%s, %s, %s, %s)\n",
|
|
scope, name, host_address_to_string (block),
|
|
domain_name (domain));
|
|
}
|
|
|
|
/* First, try to find the symbol in the given namespace. */
|
|
sym = cp_lookup_symbol_in_namespace (scope, name, block, domain, 1);
|
|
|
|
/* Search for name in namespaces imported to this and parent blocks. */
|
|
if (sym.symbol == NULL)
|
|
sym = cp_lookup_symbol_via_all_imports (scope, name, block, domain);
|
|
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_symbol_namespace (...) = %s\n",
|
|
sym.symbol != NULL
|
|
? host_address_to_string (sym.symbol) : "NULL");
|
|
}
|
|
return sym;
|
|
}
|
|
|
|
/* Lookup NAME at namespace scope (or, in C terms, in static and
|
|
global variables). SCOPE is the namespace that the current
|
|
function is defined within; only consider namespaces whose length
|
|
is at least SCOPE_LEN. Other arguments are as in
|
|
cp_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_namespace_scope (const struct language_defn *langdef,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain,
|
|
const char *scope,
|
|
int scope_len)
|
|
{
|
|
char *the_namespace;
|
|
|
|
if (scope[scope_len] != '\0')
|
|
{
|
|
/* Recursively search for names in child namespaces 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 += 2;
|
|
}
|
|
new_scope_len += cp_find_first_component (scope + new_scope_len);
|
|
sym = lookup_namespace_scope (langdef, 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 namespace.
|
|
|
|
If we there is no scope and we know we have a bare symbol, then short
|
|
circuit everything and call cp_lookup_bare_symbol directly.
|
|
This isn't an optimization, rather it allows us to pass LANGDEF which
|
|
is needed for primitive type lookup. The test doesn't have to be
|
|
perfect: if NAME is a bare symbol that our test doesn't catch (e.g., a
|
|
template symbol with "::" in the argument list) then
|
|
cp_lookup_symbol_in_namespace will catch it. */
|
|
|
|
if (scope_len == 0 && strchr (name, ':') == NULL)
|
|
return cp_lookup_bare_symbol (langdef, name, block, domain, 1);
|
|
|
|
the_namespace = (char *) alloca (scope_len + 1);
|
|
strncpy (the_namespace, scope, scope_len);
|
|
the_namespace[scope_len] = '\0';
|
|
return cp_lookup_symbol_in_namespace (the_namespace, name,
|
|
block, domain, 1);
|
|
}
|
|
|
|
/* The C++-specific version of name lookup for static and global
|
|
names. This makes sure that names get looked for in all namespaces
|
|
that are in scope. NAME is the natural name of the symbol that
|
|
we're looking for, BLOCK is the block that we're searching within,
|
|
DOMAIN says what kind of symbols we're looking for. */
|
|
|
|
struct block_symbol
|
|
cp_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);
|
|
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_symbol_non_local"
|
|
" (%s, %s (scope %s), %s)\n",
|
|
name, host_address_to_string (block), scope,
|
|
domain_name (domain));
|
|
}
|
|
|
|
/* First, try to find the symbol in the given namespace, and all
|
|
containing namespaces. */
|
|
sym = lookup_namespace_scope (langdef, name, block, domain, scope, 0);
|
|
|
|
/* Search for name in namespaces imported to this and parent blocks. */
|
|
if (sym.symbol == NULL)
|
|
sym = cp_lookup_symbol_via_all_imports (scope, name, block, domain);
|
|
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_symbol_nonlocal (...) = %s\n",
|
|
(sym.symbol != NULL
|
|
? host_address_to_string (sym.symbol)
|
|
: "NULL"));
|
|
}
|
|
return sym;
|
|
}
|
|
|
|
/* Search through the base classes of PARENT_TYPE for a base class
|
|
named NAME and return its type. If not found, return NULL. */
|
|
|
|
struct type *
|
|
cp_find_type_baseclass_by_name (struct type *parent_type, const char *name)
|
|
{
|
|
int i;
|
|
|
|
parent_type = check_typedef (parent_type);
|
|
for (i = 0; i < TYPE_N_BASECLASSES (parent_type); ++i)
|
|
{
|
|
struct type *type = check_typedef (TYPE_BASECLASS (parent_type, i));
|
|
const char *base_name = TYPE_BASECLASS_NAME (parent_type, i);
|
|
|
|
if (base_name == NULL)
|
|
continue;
|
|
|
|
if (streq (base_name, name))
|
|
return type;
|
|
|
|
type = cp_find_type_baseclass_by_name (type, name);
|
|
if (type != NULL)
|
|
return type;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* 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, const domain_enum domain,
|
|
int is_in_anonymous)
|
|
{
|
|
int i;
|
|
struct block_symbol sym;
|
|
struct cleanup *cleanup;
|
|
char *concatenated_name;
|
|
|
|
sym.symbol = NULL;
|
|
sym.block = NULL;
|
|
concatenated_name = 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;
|
|
|
|
len = strlen (base_name) + 2 + strlen (name) + 1;
|
|
concatenated_name = (char *) xrealloc (concatenated_name, len);
|
|
xsnprintf (concatenated_name, len, "%s::%s", base_name, name);
|
|
|
|
sym = cp_lookup_nested_symbol_1 (base_type, name, concatenated_name,
|
|
block, domain, 1, is_in_anonymous);
|
|
if (sym.symbol != NULL)
|
|
break;
|
|
}
|
|
|
|
do_cleanups (cleanup);
|
|
return sym;
|
|
}
|
|
|
|
/* Helper function to look up NESTED_NAME in CONTAINER_TYPE and in DOMAIN
|
|
and within the context of BLOCK.
|
|
NESTED_NAME may have scope ("::").
|
|
CONTAINER_TYPE needn't have been "check_typedef'd" yet.
|
|
CONCATENATED_NAME is the fully scoped spelling of NESTED_NAME, it is
|
|
passed as an argument so that callers can control how space for it is
|
|
allocated.
|
|
If BASIC_LOOKUP is non-zero then perform a basic lookup of
|
|
CONCATENATED_NAME. See cp_basic_lookup_symbol for details.
|
|
If IS_IN_ANONYMOUS is non-zero then CONCATENATED_NAME is in an anonymous
|
|
namespace. */
|
|
|
|
static struct block_symbol
|
|
cp_lookup_nested_symbol_1 (struct type *container_type,
|
|
const char *nested_name,
|
|
const char *concatenated_name,
|
|
const struct block *block,
|
|
const domain_enum domain,
|
|
int basic_lookup, int is_in_anonymous)
|
|
{
|
|
struct block_symbol sym;
|
|
|
|
/* NOTE: carlton/2003-11-10: We don't treat C++ class members
|
|
of classes like, say, data or function members. Instead,
|
|
they're just represented by symbols whose names are
|
|
qualified by the name of the surrounding class. This is
|
|
just like members of namespaces; in particular,
|
|
cp_basic_lookup_symbol works when looking them up. */
|
|
|
|
if (basic_lookup)
|
|
{
|
|
sym = cp_basic_lookup_symbol (concatenated_name, block, domain,
|
|
is_in_anonymous);
|
|
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
|
|
namespace as even the fully specified namespace search is already not
|
|
C++ compliant and more assumptions could make it too magic. */
|
|
|
|
/* First search in this symtab, what we want is possibly there. */
|
|
sym = lookup_symbol_in_static_block (concatenated_name, block, domain);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
|
|
/* 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. Except for symbols defined in
|
|
anonymous namespaces should be treated as local to a single file,
|
|
which we just searched. */
|
|
if (!is_in_anonymous)
|
|
{
|
|
sym = lookup_static_symbol (concatenated_name, domain);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
}
|
|
|
|
/* If this is a class with baseclasses, search them next. */
|
|
container_type = check_typedef (container_type);
|
|
if (TYPE_N_BASECLASSES (container_type) > 0)
|
|
{
|
|
sym = find_symbol_in_baseclass (container_type, nested_name, block,
|
|
domain, is_in_anonymous);
|
|
if (sym.symbol != NULL)
|
|
return sym;
|
|
}
|
|
|
|
return (struct block_symbol) {NULL, NULL};
|
|
}
|
|
|
|
/* Look up a symbol named NESTED_NAME that is nested inside the C++
|
|
class or namespace given by PARENT_TYPE, from within the context
|
|
given by BLOCK, and in DOMAIN.
|
|
Return NULL if there is no such nested symbol. */
|
|
|
|
struct block_symbol
|
|
cp_lookup_nested_symbol (struct type *parent_type,
|
|
const char *nested_name,
|
|
const struct block *block,
|
|
const domain_enum domain)
|
|
{
|
|
/* type_name_no_tag_or_error provides better error reporting using the
|
|
original type. */
|
|
struct type *saved_parent_type = parent_type;
|
|
|
|
parent_type = check_typedef (parent_type);
|
|
|
|
if (symbol_lookup_debug)
|
|
{
|
|
const char *type_name = type_name_no_tag (saved_parent_type);
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_nested_symbol (%s, %s, %s, %s)\n",
|
|
type_name != NULL ? type_name : "unnamed",
|
|
nested_name, host_address_to_string (block),
|
|
domain_name (domain));
|
|
}
|
|
|
|
switch (TYPE_CODE (parent_type))
|
|
{
|
|
case TYPE_CODE_STRUCT:
|
|
case TYPE_CODE_NAMESPACE:
|
|
case TYPE_CODE_UNION:
|
|
case TYPE_CODE_ENUM:
|
|
/* NOTE: Handle modules here as well, because Fortran is re-using the C++
|
|
specific code to lookup nested symbols in modules, by calling the
|
|
function pointer la_lookup_symbol_nonlocal, which ends up here. */
|
|
case TYPE_CODE_MODULE:
|
|
{
|
|
int size;
|
|
const char *parent_name = type_name_no_tag_or_error (saved_parent_type);
|
|
struct block_symbol sym;
|
|
char *concatenated_name;
|
|
int is_in_anonymous;
|
|
|
|
size = strlen (parent_name) + 2 + strlen (nested_name) + 1;
|
|
concatenated_name = (char *) alloca (size);
|
|
xsnprintf (concatenated_name, size, "%s::%s",
|
|
parent_name, nested_name);
|
|
is_in_anonymous = cp_is_in_anonymous (concatenated_name);
|
|
|
|
sym = cp_lookup_nested_symbol_1 (parent_type, nested_name,
|
|
concatenated_name, block, domain,
|
|
1, is_in_anonymous);
|
|
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_nested_symbol (...) = %s\n",
|
|
(sym.symbol != NULL
|
|
? host_address_to_string (sym.symbol)
|
|
: "NULL"));
|
|
}
|
|
return sym;
|
|
}
|
|
|
|
case TYPE_CODE_FUNC:
|
|
case TYPE_CODE_METHOD:
|
|
if (symbol_lookup_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"cp_lookup_nested_symbol (...) = NULL"
|
|
" (func/method)\n");
|
|
}
|
|
return (struct block_symbol) {NULL, NULL};
|
|
|
|
default:
|
|
internal_error (__FILE__, __LINE__,
|
|
_("cp_lookup_nested_symbol called "
|
|
"on a non-aggregate type."));
|
|
}
|
|
}
|
|
|
|
/* The C++-version of lookup_transparent_type. */
|
|
|
|
/* FIXME: carlton/2004-01-16: The problem that this is trying to
|
|
address is that, unfortunately, sometimes NAME is wrong: it may not
|
|
include the name of namespaces enclosing the type in question.
|
|
lookup_transparent_type gets called when the type in question
|
|
is a declaration, and we're trying to find its definition; but, for
|
|
declarations, our type name deduction mechanism doesn't work.
|
|
There's nothing we can do to fix this in general, I think, in the
|
|
absence of debug information about namespaces (I've filed PR
|
|
gdb/1511 about this); until such debug information becomes more
|
|
prevalent, one heuristic which sometimes looks is to search for the
|
|
definition in namespaces containing the current namespace.
|
|
|
|
We should delete this functions once the appropriate debug
|
|
information becomes more widespread. (GCC 3.4 will be the first
|
|
released version of GCC with such information.) */
|
|
|
|
struct type *
|
|
cp_lookup_transparent_type (const char *name)
|
|
{
|
|
/* First, try the honest way of looking up the definition. */
|
|
struct type *t = basic_lookup_transparent_type (name);
|
|
const char *scope;
|
|
|
|
if (t != NULL)
|
|
return t;
|
|
|
|
/* If that doesn't work and we're within a namespace, look there
|
|
instead. */
|
|
scope = block_scope (get_selected_block (0));
|
|
|
|
if (scope[0] == '\0')
|
|
return NULL;
|
|
|
|
return cp_lookup_transparent_type_loop (name, scope, 0);
|
|
}
|
|
|
|
/* Lookup the type definition associated to NAME in namespaces/classes
|
|
containing SCOPE whose name is strictly longer than LENGTH. LENGTH
|
|
must be the index of the start of a component of SCOPE. */
|
|
|
|
static struct type *
|
|
cp_lookup_transparent_type_loop (const char *name,
|
|
const char *scope,
|
|
int length)
|
|
{
|
|
int scope_length = length + cp_find_first_component (scope + length);
|
|
char *full_name;
|
|
|
|
/* If the current scope is followed by "::", look in the next
|
|
component. */
|
|
if (scope[scope_length] == ':')
|
|
{
|
|
struct type *retval
|
|
= cp_lookup_transparent_type_loop (name, scope,
|
|
scope_length + 2);
|
|
|
|
if (retval != NULL)
|
|
return retval;
|
|
}
|
|
|
|
full_name = (char *) alloca (scope_length + 2 + strlen (name) + 1);
|
|
strncpy (full_name, scope, scope_length);
|
|
strncpy (full_name + scope_length, "::", 2);
|
|
strcpy (full_name + scope_length + 2, name);
|
|
|
|
return basic_lookup_transparent_type (full_name);
|
|
}
|
|
|
|
/* This used to do something but was removed when it became
|
|
obsolete. */
|
|
|
|
static void
|
|
maintenance_cplus_namespace (char *args, int from_tty)
|
|
{
|
|
printf_unfiltered (_("The `maint namespace' command was removed.\n"));
|
|
}
|
|
|
|
/* Provide a prototype to silence -Wmissing-prototypes. */
|
|
extern initialize_file_ftype _initialize_cp_namespace;
|
|
|
|
void
|
|
_initialize_cp_namespace (void)
|
|
{
|
|
struct cmd_list_element *cmd;
|
|
|
|
cmd = add_cmd ("namespace", class_maintenance,
|
|
maintenance_cplus_namespace,
|
|
_("Deprecated placeholder for removed functionality."),
|
|
&maint_cplus_cmd_list);
|
|
deprecate_cmd (cmd, NULL);
|
|
}
|