mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +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.
1709 lines
45 KiB
C
1709 lines
45 KiB
C
/* Helper routines for C++ support in GDB.
|
|
Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
|
|
|
Contributed by MontaVista Software.
|
|
|
|
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 "demangle.h"
|
|
#include "gdbcmd.h"
|
|
#include "dictionary.h"
|
|
#include "objfiles.h"
|
|
#include "frame.h"
|
|
#include "symtab.h"
|
|
#include "block.h"
|
|
#include "complaints.h"
|
|
#include "gdbtypes.h"
|
|
#include "expression.h"
|
|
#include "value.h"
|
|
#include "cp-abi.h"
|
|
#include "namespace.h"
|
|
#include <signal.h>
|
|
|
|
#include "safe-ctype.h"
|
|
|
|
#define d_left(dc) (dc)->u.s_binary.left
|
|
#define d_right(dc) (dc)->u.s_binary.right
|
|
|
|
/* Functions related to demangled name parsing. */
|
|
|
|
static unsigned int cp_find_first_component_aux (const char *name,
|
|
int permissive);
|
|
|
|
static void demangled_name_complaint (const char *name);
|
|
|
|
/* Functions/variables related to overload resolution. */
|
|
|
|
static int sym_return_val_size = -1;
|
|
static int sym_return_val_index;
|
|
static struct symbol **sym_return_val;
|
|
|
|
static void overload_list_add_symbol (struct symbol *sym,
|
|
const char *oload_name);
|
|
|
|
static void make_symbol_overload_list_using (const char *func_name,
|
|
const char *the_namespace);
|
|
|
|
static void make_symbol_overload_list_qualified (const char *func_name);
|
|
|
|
/* The list of "maint cplus" commands. */
|
|
|
|
struct cmd_list_element *maint_cplus_cmd_list = NULL;
|
|
|
|
/* The actual commands. */
|
|
|
|
static void maint_cplus_command (char *arg, int from_tty);
|
|
static void first_component_command (char *arg, int from_tty);
|
|
|
|
/* A list of typedefs which should not be substituted by replace_typedefs. */
|
|
static const char * const ignore_typedefs[] =
|
|
{
|
|
"std::istream", "std::iostream", "std::ostream", "std::string"
|
|
};
|
|
|
|
static void
|
|
replace_typedefs (struct demangle_parse_info *info,
|
|
struct demangle_component *ret_comp,
|
|
canonicalization_ftype *finder,
|
|
void *data);
|
|
|
|
/* A convenience function to copy STRING into OBSTACK, returning a pointer
|
|
to the newly allocated string and saving the number of bytes saved in LEN.
|
|
|
|
It does not copy the terminating '\0' byte! */
|
|
|
|
static char *
|
|
copy_string_to_obstack (struct obstack *obstack, const char *string,
|
|
long *len)
|
|
{
|
|
*len = strlen (string);
|
|
return (char *) obstack_copy (obstack, string, *len);
|
|
}
|
|
|
|
/* A cleanup wrapper for cp_demangled_name_parse_free. */
|
|
|
|
static void
|
|
do_demangled_name_parse_free_cleanup (void *data)
|
|
{
|
|
struct demangle_parse_info *info = (struct demangle_parse_info *) data;
|
|
|
|
cp_demangled_name_parse_free (info);
|
|
}
|
|
|
|
/* Create a cleanup for C++ name parsing. */
|
|
|
|
struct cleanup *
|
|
make_cleanup_cp_demangled_name_parse_free (struct demangle_parse_info *info)
|
|
{
|
|
return make_cleanup (do_demangled_name_parse_free_cleanup, info);
|
|
}
|
|
|
|
/* Return 1 if STRING is clearly already in canonical form. This
|
|
function is conservative; things which it does not recognize are
|
|
assumed to be non-canonical, and the parser will sort them out
|
|
afterwards. This speeds up the critical path for alphanumeric
|
|
identifiers. */
|
|
|
|
static int
|
|
cp_already_canonical (const char *string)
|
|
{
|
|
/* Identifier start character [a-zA-Z_]. */
|
|
if (!ISIDST (string[0]))
|
|
return 0;
|
|
|
|
/* These are the only two identifiers which canonicalize to other
|
|
than themselves or an error: unsigned -> unsigned int and
|
|
signed -> int. */
|
|
if (string[0] == 'u' && strcmp (&string[1], "nsigned") == 0)
|
|
return 0;
|
|
else if (string[0] == 's' && strcmp (&string[1], "igned") == 0)
|
|
return 0;
|
|
|
|
/* Identifier character [a-zA-Z0-9_]. */
|
|
while (ISIDNUM (string[1]))
|
|
string++;
|
|
|
|
if (string[1] == '\0')
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* Inspect the given RET_COMP for its type. If it is a typedef,
|
|
replace the node with the typedef's tree.
|
|
|
|
Returns 1 if any typedef substitutions were made, 0 otherwise. */
|
|
|
|
static int
|
|
inspect_type (struct demangle_parse_info *info,
|
|
struct demangle_component *ret_comp,
|
|
canonicalization_ftype *finder,
|
|
void *data)
|
|
{
|
|
int i;
|
|
char *name;
|
|
struct symbol *sym;
|
|
|
|
/* Copy the symbol's name from RET_COMP and look it up
|
|
in the symbol table. */
|
|
name = (char *) alloca (ret_comp->u.s_name.len + 1);
|
|
memcpy (name, ret_comp->u.s_name.s, ret_comp->u.s_name.len);
|
|
name[ret_comp->u.s_name.len] = '\0';
|
|
|
|
/* Ignore any typedefs that should not be substituted. */
|
|
for (i = 0; i < ARRAY_SIZE (ignore_typedefs); ++i)
|
|
{
|
|
if (strcmp (name, ignore_typedefs[i]) == 0)
|
|
return 0;
|
|
}
|
|
|
|
sym = NULL;
|
|
|
|
TRY
|
|
{
|
|
sym = lookup_symbol (name, 0, VAR_DOMAIN, 0).symbol;
|
|
}
|
|
CATCH (except, RETURN_MASK_ALL)
|
|
{
|
|
return 0;
|
|
}
|
|
END_CATCH
|
|
|
|
if (sym != NULL)
|
|
{
|
|
struct type *otype = SYMBOL_TYPE (sym);
|
|
|
|
if (finder != NULL)
|
|
{
|
|
const char *new_name = (*finder) (otype, data);
|
|
|
|
if (new_name != NULL)
|
|
{
|
|
ret_comp->u.s_name.s = new_name;
|
|
ret_comp->u.s_name.len = strlen (new_name);
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* If the type is a typedef or namespace alias, replace it. */
|
|
if (TYPE_CODE (otype) == TYPE_CODE_TYPEDEF
|
|
|| TYPE_CODE (otype) == TYPE_CODE_NAMESPACE)
|
|
{
|
|
long len;
|
|
int is_anon;
|
|
struct type *type;
|
|
struct demangle_parse_info *i;
|
|
struct ui_file *buf;
|
|
|
|
/* Get the real type of the typedef. */
|
|
type = check_typedef (otype);
|
|
|
|
/* If the symbol is a namespace and its type name is no different
|
|
than the name we looked up, this symbol is not a namespace
|
|
alias and does not need to be substituted. */
|
|
if (TYPE_CODE (otype) == TYPE_CODE_NAMESPACE
|
|
&& strcmp (TYPE_NAME (type), name) == 0)
|
|
return 0;
|
|
|
|
is_anon = (TYPE_TAG_NAME (type) == NULL
|
|
&& (TYPE_CODE (type) == TYPE_CODE_ENUM
|
|
|| TYPE_CODE (type) == TYPE_CODE_STRUCT
|
|
|| TYPE_CODE (type) == TYPE_CODE_UNION));
|
|
if (is_anon)
|
|
{
|
|
struct type *last = otype;
|
|
|
|
/* Find the last typedef for the type. */
|
|
while (TYPE_TARGET_TYPE (last) != NULL
|
|
&& (TYPE_CODE (TYPE_TARGET_TYPE (last))
|
|
== TYPE_CODE_TYPEDEF))
|
|
last = TYPE_TARGET_TYPE (last);
|
|
|
|
/* If there is only one typedef for this anonymous type,
|
|
do not substitute it. */
|
|
if (type == otype)
|
|
return 0;
|
|
else
|
|
/* Use the last typedef seen as the type for this
|
|
anonymous type. */
|
|
type = last;
|
|
}
|
|
|
|
buf = mem_fileopen ();
|
|
TRY
|
|
{
|
|
type_print (type, "", buf, -1);
|
|
}
|
|
|
|
/* If type_print threw an exception, there is little point
|
|
in continuing, so just bow out gracefully. */
|
|
CATCH (except, RETURN_MASK_ERROR)
|
|
{
|
|
ui_file_delete (buf);
|
|
return 0;
|
|
}
|
|
END_CATCH
|
|
|
|
name = ui_file_obsavestring (buf, &info->obstack, &len);
|
|
ui_file_delete (buf);
|
|
|
|
/* Turn the result into a new tree. Note that this
|
|
tree will contain pointers into NAME, so NAME cannot
|
|
be free'd until all typedef conversion is done and
|
|
the final result is converted into a string. */
|
|
i = cp_demangled_name_to_comp (name, NULL);
|
|
if (i != NULL)
|
|
{
|
|
/* Merge the two trees. */
|
|
cp_merge_demangle_parse_infos (info, ret_comp, i);
|
|
|
|
/* Replace any newly introduced typedefs -- but not
|
|
if the type is anonymous (that would lead to infinite
|
|
looping). */
|
|
if (!is_anon)
|
|
replace_typedefs (info, ret_comp, finder, data);
|
|
}
|
|
else
|
|
{
|
|
/* This shouldn't happen unless the type printer has
|
|
output something that the name parser cannot grok.
|
|
Nonetheless, an ounce of prevention...
|
|
|
|
Canonicalize the name again, and store it in the
|
|
current node (RET_COMP). */
|
|
char *canon = cp_canonicalize_string_no_typedefs (name);
|
|
|
|
if (canon != NULL)
|
|
{
|
|
/* Copy the canonicalization into the obstack and
|
|
free CANON. */
|
|
name = copy_string_to_obstack (&info->obstack, canon, &len);
|
|
xfree (canon);
|
|
}
|
|
|
|
ret_comp->u.s_name.s = name;
|
|
ret_comp->u.s_name.len = len;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Replace any typedefs appearing in the qualified name
|
|
(DEMANGLE_COMPONENT_QUAL_NAME) represented in RET_COMP for the name parse
|
|
given in INFO. */
|
|
|
|
static void
|
|
replace_typedefs_qualified_name (struct demangle_parse_info *info,
|
|
struct demangle_component *ret_comp,
|
|
canonicalization_ftype *finder,
|
|
void *data)
|
|
{
|
|
long len;
|
|
char *name;
|
|
struct ui_file *buf = mem_fileopen ();
|
|
struct demangle_component *comp = ret_comp;
|
|
|
|
/* Walk each node of the qualified name, reconstructing the name of
|
|
this element. With every node, check for any typedef substitutions.
|
|
If a substitution has occurred, replace the qualified name node
|
|
with a DEMANGLE_COMPONENT_NAME node representing the new, typedef-
|
|
substituted name. */
|
|
while (comp->type == DEMANGLE_COMPONENT_QUAL_NAME)
|
|
{
|
|
if (d_left (comp)->type == DEMANGLE_COMPONENT_NAME)
|
|
{
|
|
struct demangle_component newobj;
|
|
|
|
ui_file_write (buf, d_left (comp)->u.s_name.s,
|
|
d_left (comp)->u.s_name.len);
|
|
name = ui_file_obsavestring (buf, &info->obstack, &len);
|
|
newobj.type = DEMANGLE_COMPONENT_NAME;
|
|
newobj.u.s_name.s = name;
|
|
newobj.u.s_name.len = len;
|
|
if (inspect_type (info, &newobj, finder, data))
|
|
{
|
|
char *n, *s;
|
|
long slen;
|
|
|
|
/* A typedef was substituted in NEW. Convert it to a
|
|
string and replace the top DEMANGLE_COMPONENT_QUAL_NAME
|
|
node. */
|
|
|
|
ui_file_rewind (buf);
|
|
n = cp_comp_to_string (&newobj, 100);
|
|
if (n == NULL)
|
|
{
|
|
/* If something went astray, abort typedef substitutions. */
|
|
ui_file_delete (buf);
|
|
return;
|
|
}
|
|
|
|
s = copy_string_to_obstack (&info->obstack, n, &slen);
|
|
xfree (n);
|
|
|
|
d_left (ret_comp)->type = DEMANGLE_COMPONENT_NAME;
|
|
d_left (ret_comp)->u.s_name.s = s;
|
|
d_left (ret_comp)->u.s_name.len = slen;
|
|
d_right (ret_comp) = d_right (comp);
|
|
comp = ret_comp;
|
|
continue;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* The current node is not a name, so simply replace any
|
|
typedefs in it. Then print it to the stream to continue
|
|
checking for more typedefs in the tree. */
|
|
replace_typedefs (info, d_left (comp), finder, data);
|
|
name = cp_comp_to_string (d_left (comp), 100);
|
|
if (name == NULL)
|
|
{
|
|
/* If something went astray, abort typedef substitutions. */
|
|
ui_file_delete (buf);
|
|
return;
|
|
}
|
|
fputs_unfiltered (name, buf);
|
|
xfree (name);
|
|
}
|
|
|
|
ui_file_write (buf, "::", 2);
|
|
comp = d_right (comp);
|
|
}
|
|
|
|
/* If the next component is DEMANGLE_COMPONENT_NAME, save the qualified
|
|
name assembled above and append the name given by COMP. Then use this
|
|
reassembled name to check for a typedef. */
|
|
|
|
if (comp->type == DEMANGLE_COMPONENT_NAME)
|
|
{
|
|
ui_file_write (buf, comp->u.s_name.s, comp->u.s_name.len);
|
|
name = ui_file_obsavestring (buf, &info->obstack, &len);
|
|
|
|
/* Replace the top (DEMANGLE_COMPONENT_QUAL_NAME) node
|
|
with a DEMANGLE_COMPONENT_NAME node containing the whole
|
|
name. */
|
|
ret_comp->type = DEMANGLE_COMPONENT_NAME;
|
|
ret_comp->u.s_name.s = name;
|
|
ret_comp->u.s_name.len = len;
|
|
inspect_type (info, ret_comp, finder, data);
|
|
}
|
|
else
|
|
replace_typedefs (info, comp, finder, data);
|
|
|
|
ui_file_delete (buf);
|
|
}
|
|
|
|
|
|
/* A function to check const and volatile qualifiers for argument types.
|
|
|
|
"Parameter declarations that differ only in the presence
|
|
or absence of `const' and/or `volatile' are equivalent."
|
|
C++ Standard N3290, clause 13.1.3 #4. */
|
|
|
|
static void
|
|
check_cv_qualifiers (struct demangle_component *ret_comp)
|
|
{
|
|
while (d_left (ret_comp) != NULL
|
|
&& (d_left (ret_comp)->type == DEMANGLE_COMPONENT_CONST
|
|
|| d_left (ret_comp)->type == DEMANGLE_COMPONENT_VOLATILE))
|
|
{
|
|
d_left (ret_comp) = d_left (d_left (ret_comp));
|
|
}
|
|
}
|
|
|
|
/* Walk the parse tree given by RET_COMP, replacing any typedefs with
|
|
their basic types. */
|
|
|
|
static void
|
|
replace_typedefs (struct demangle_parse_info *info,
|
|
struct demangle_component *ret_comp,
|
|
canonicalization_ftype *finder,
|
|
void *data)
|
|
{
|
|
if (ret_comp)
|
|
{
|
|
if (finder != NULL
|
|
&& (ret_comp->type == DEMANGLE_COMPONENT_NAME
|
|
|| ret_comp->type == DEMANGLE_COMPONENT_QUAL_NAME
|
|
|| ret_comp->type == DEMANGLE_COMPONENT_TEMPLATE
|
|
|| ret_comp->type == DEMANGLE_COMPONENT_BUILTIN_TYPE))
|
|
{
|
|
char *local_name = cp_comp_to_string (ret_comp, 10);
|
|
|
|
if (local_name != NULL)
|
|
{
|
|
struct symbol *sym = NULL;
|
|
|
|
sym = NULL;
|
|
TRY
|
|
{
|
|
sym = lookup_symbol (local_name, 0, VAR_DOMAIN, 0).symbol;
|
|
}
|
|
CATCH (except, RETURN_MASK_ALL)
|
|
{
|
|
}
|
|
END_CATCH
|
|
|
|
xfree (local_name);
|
|
|
|
if (sym != NULL)
|
|
{
|
|
struct type *otype = SYMBOL_TYPE (sym);
|
|
const char *new_name = (*finder) (otype, data);
|
|
|
|
if (new_name != NULL)
|
|
{
|
|
ret_comp->type = DEMANGLE_COMPONENT_NAME;
|
|
ret_comp->u.s_name.s = new_name;
|
|
ret_comp->u.s_name.len = strlen (new_name);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
switch (ret_comp->type)
|
|
{
|
|
case DEMANGLE_COMPONENT_ARGLIST:
|
|
check_cv_qualifiers (ret_comp);
|
|
/* Fall through */
|
|
|
|
case DEMANGLE_COMPONENT_FUNCTION_TYPE:
|
|
case DEMANGLE_COMPONENT_TEMPLATE:
|
|
case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
|
|
case DEMANGLE_COMPONENT_TYPED_NAME:
|
|
replace_typedefs (info, d_left (ret_comp), finder, data);
|
|
replace_typedefs (info, d_right (ret_comp), finder, data);
|
|
break;
|
|
|
|
case DEMANGLE_COMPONENT_NAME:
|
|
inspect_type (info, ret_comp, finder, data);
|
|
break;
|
|
|
|
case DEMANGLE_COMPONENT_QUAL_NAME:
|
|
replace_typedefs_qualified_name (info, ret_comp, finder, data);
|
|
break;
|
|
|
|
case DEMANGLE_COMPONENT_LOCAL_NAME:
|
|
case DEMANGLE_COMPONENT_CTOR:
|
|
case DEMANGLE_COMPONENT_ARRAY_TYPE:
|
|
case DEMANGLE_COMPONENT_PTRMEM_TYPE:
|
|
replace_typedefs (info, d_right (ret_comp), finder, data);
|
|
break;
|
|
|
|
case DEMANGLE_COMPONENT_CONST:
|
|
case DEMANGLE_COMPONENT_RESTRICT:
|
|
case DEMANGLE_COMPONENT_VOLATILE:
|
|
case DEMANGLE_COMPONENT_VOLATILE_THIS:
|
|
case DEMANGLE_COMPONENT_CONST_THIS:
|
|
case DEMANGLE_COMPONENT_RESTRICT_THIS:
|
|
case DEMANGLE_COMPONENT_POINTER:
|
|
case DEMANGLE_COMPONENT_REFERENCE:
|
|
replace_typedefs (info, d_left (ret_comp), finder, data);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Parse STRING and convert it to canonical form, resolving any typedefs.
|
|
If parsing fails, or if STRING is already canonical, return NULL.
|
|
Otherwise return the canonical form. The return value is allocated via
|
|
xmalloc. If FINDER is not NULL, then type components are passed to
|
|
FINDER to be looked up. DATA is passed verbatim to FINDER. */
|
|
|
|
char *
|
|
cp_canonicalize_string_full (const char *string,
|
|
canonicalization_ftype *finder,
|
|
void *data)
|
|
{
|
|
char *ret;
|
|
unsigned int estimated_len;
|
|
struct demangle_parse_info *info;
|
|
|
|
ret = NULL;
|
|
estimated_len = strlen (string) * 2;
|
|
info = cp_demangled_name_to_comp (string, NULL);
|
|
if (info != NULL)
|
|
{
|
|
/* Replace all the typedefs in the tree. */
|
|
replace_typedefs (info, info->tree, finder, data);
|
|
|
|
/* Convert the tree back into a string. */
|
|
ret = cp_comp_to_string (info->tree, estimated_len);
|
|
gdb_assert (ret != NULL);
|
|
|
|
/* Free the parse information. */
|
|
cp_demangled_name_parse_free (info);
|
|
|
|
/* Finally, compare the original string with the computed
|
|
name, returning NULL if they are the same. */
|
|
if (strcmp (string, ret) == 0)
|
|
{
|
|
xfree (ret);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Like cp_canonicalize_string_full, but always passes NULL for
|
|
FINDER. */
|
|
|
|
char *
|
|
cp_canonicalize_string_no_typedefs (const char *string)
|
|
{
|
|
return cp_canonicalize_string_full (string, NULL, NULL);
|
|
}
|
|
|
|
/* Parse STRING and convert it to canonical form. If parsing fails,
|
|
or if STRING is already canonical, return NULL. Otherwise return
|
|
the canonical form. The return value is allocated via xmalloc. */
|
|
|
|
char *
|
|
cp_canonicalize_string (const char *string)
|
|
{
|
|
struct demangle_parse_info *info;
|
|
unsigned int estimated_len;
|
|
char *ret;
|
|
|
|
if (cp_already_canonical (string))
|
|
return NULL;
|
|
|
|
info = cp_demangled_name_to_comp (string, NULL);
|
|
if (info == NULL)
|
|
return NULL;
|
|
|
|
estimated_len = strlen (string) * 2;
|
|
ret = cp_comp_to_string (info->tree, estimated_len);
|
|
cp_demangled_name_parse_free (info);
|
|
|
|
if (ret == NULL)
|
|
{
|
|
warning (_("internal error: string \"%s\" failed to be canonicalized"),
|
|
string);
|
|
return NULL;
|
|
}
|
|
|
|
if (strcmp (string, ret) == 0)
|
|
{
|
|
xfree (ret);
|
|
return NULL;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Convert a mangled name to a demangle_component tree. *MEMORY is
|
|
set to the block of used memory that should be freed when finished
|
|
with the tree. DEMANGLED_P is set to the char * that should be
|
|
freed when finished with the tree, or NULL if none was needed.
|
|
OPTIONS will be passed to the demangler. */
|
|
|
|
static struct demangle_parse_info *
|
|
mangled_name_to_comp (const char *mangled_name, int options,
|
|
void **memory, char **demangled_p)
|
|
{
|
|
char *demangled_name;
|
|
struct demangle_parse_info *info;
|
|
|
|
/* If it looks like a v3 mangled name, then try to go directly
|
|
to trees. */
|
|
if (mangled_name[0] == '_' && mangled_name[1] == 'Z')
|
|
{
|
|
struct demangle_component *ret;
|
|
|
|
ret = cplus_demangle_v3_components (mangled_name,
|
|
options, memory);
|
|
if (ret)
|
|
{
|
|
info = cp_new_demangle_parse_info ();
|
|
info->tree = ret;
|
|
*demangled_p = NULL;
|
|
return info;
|
|
}
|
|
}
|
|
|
|
/* If it doesn't, or if that failed, then try to demangle the
|
|
name. */
|
|
demangled_name = gdb_demangle (mangled_name, options);
|
|
if (demangled_name == NULL)
|
|
return NULL;
|
|
|
|
/* If we could demangle the name, parse it to build the component
|
|
tree. */
|
|
info = cp_demangled_name_to_comp (demangled_name, NULL);
|
|
|
|
if (info == NULL)
|
|
{
|
|
xfree (demangled_name);
|
|
return NULL;
|
|
}
|
|
|
|
*demangled_p = demangled_name;
|
|
return info;
|
|
}
|
|
|
|
/* Return the name of the class containing method PHYSNAME. */
|
|
|
|
char *
|
|
cp_class_name_from_physname (const char *physname)
|
|
{
|
|
void *storage = NULL;
|
|
char *demangled_name = NULL, *ret;
|
|
struct demangle_component *ret_comp, *prev_comp, *cur_comp;
|
|
struct demangle_parse_info *info;
|
|
int done;
|
|
|
|
info = mangled_name_to_comp (physname, DMGL_ANSI,
|
|
&storage, &demangled_name);
|
|
if (info == NULL)
|
|
return NULL;
|
|
|
|
done = 0;
|
|
ret_comp = info->tree;
|
|
|
|
/* First strip off any qualifiers, if we have a function or
|
|
method. */
|
|
while (!done)
|
|
switch (ret_comp->type)
|
|
{
|
|
case DEMANGLE_COMPONENT_CONST:
|
|
case DEMANGLE_COMPONENT_RESTRICT:
|
|
case DEMANGLE_COMPONENT_VOLATILE:
|
|
case DEMANGLE_COMPONENT_CONST_THIS:
|
|
case DEMANGLE_COMPONENT_RESTRICT_THIS:
|
|
case DEMANGLE_COMPONENT_VOLATILE_THIS:
|
|
case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
|
|
ret_comp = d_left (ret_comp);
|
|
break;
|
|
default:
|
|
done = 1;
|
|
break;
|
|
}
|
|
|
|
/* If what we have now is a function, discard the argument list. */
|
|
if (ret_comp->type == DEMANGLE_COMPONENT_TYPED_NAME)
|
|
ret_comp = d_left (ret_comp);
|
|
|
|
/* If what we have now is a template, strip off the template
|
|
arguments. The left subtree may be a qualified name. */
|
|
if (ret_comp->type == DEMANGLE_COMPONENT_TEMPLATE)
|
|
ret_comp = d_left (ret_comp);
|
|
|
|
/* What we have now should be a name, possibly qualified.
|
|
Additional qualifiers could live in the left subtree or the right
|
|
subtree. Find the last piece. */
|
|
done = 0;
|
|
prev_comp = NULL;
|
|
cur_comp = ret_comp;
|
|
while (!done)
|
|
switch (cur_comp->type)
|
|
{
|
|
case DEMANGLE_COMPONENT_QUAL_NAME:
|
|
case DEMANGLE_COMPONENT_LOCAL_NAME:
|
|
prev_comp = cur_comp;
|
|
cur_comp = d_right (cur_comp);
|
|
break;
|
|
case DEMANGLE_COMPONENT_TEMPLATE:
|
|
case DEMANGLE_COMPONENT_NAME:
|
|
case DEMANGLE_COMPONENT_CTOR:
|
|
case DEMANGLE_COMPONENT_DTOR:
|
|
case DEMANGLE_COMPONENT_OPERATOR:
|
|
case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
|
|
done = 1;
|
|
break;
|
|
default:
|
|
done = 1;
|
|
cur_comp = NULL;
|
|
break;
|
|
}
|
|
|
|
ret = NULL;
|
|
if (cur_comp != NULL && prev_comp != NULL)
|
|
{
|
|
/* We want to discard the rightmost child of PREV_COMP. */
|
|
*prev_comp = *d_left (prev_comp);
|
|
/* The ten is completely arbitrary; we don't have a good
|
|
estimate. */
|
|
ret = cp_comp_to_string (ret_comp, 10);
|
|
}
|
|
|
|
xfree (storage);
|
|
xfree (demangled_name);
|
|
cp_demangled_name_parse_free (info);
|
|
return ret;
|
|
}
|
|
|
|
/* Return the child of COMP which is the basename of a method,
|
|
variable, et cetera. All scope qualifiers are discarded, but
|
|
template arguments will be included. The component tree may be
|
|
modified. */
|
|
|
|
static struct demangle_component *
|
|
unqualified_name_from_comp (struct demangle_component *comp)
|
|
{
|
|
struct demangle_component *ret_comp = comp, *last_template;
|
|
int done;
|
|
|
|
done = 0;
|
|
last_template = NULL;
|
|
while (!done)
|
|
switch (ret_comp->type)
|
|
{
|
|
case DEMANGLE_COMPONENT_QUAL_NAME:
|
|
case DEMANGLE_COMPONENT_LOCAL_NAME:
|
|
ret_comp = d_right (ret_comp);
|
|
break;
|
|
case DEMANGLE_COMPONENT_TYPED_NAME:
|
|
ret_comp = d_left (ret_comp);
|
|
break;
|
|
case DEMANGLE_COMPONENT_TEMPLATE:
|
|
gdb_assert (last_template == NULL);
|
|
last_template = ret_comp;
|
|
ret_comp = d_left (ret_comp);
|
|
break;
|
|
case DEMANGLE_COMPONENT_CONST:
|
|
case DEMANGLE_COMPONENT_RESTRICT:
|
|
case DEMANGLE_COMPONENT_VOLATILE:
|
|
case DEMANGLE_COMPONENT_CONST_THIS:
|
|
case DEMANGLE_COMPONENT_RESTRICT_THIS:
|
|
case DEMANGLE_COMPONENT_VOLATILE_THIS:
|
|
case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
|
|
ret_comp = d_left (ret_comp);
|
|
break;
|
|
case DEMANGLE_COMPONENT_NAME:
|
|
case DEMANGLE_COMPONENT_CTOR:
|
|
case DEMANGLE_COMPONENT_DTOR:
|
|
case DEMANGLE_COMPONENT_OPERATOR:
|
|
case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
|
|
done = 1;
|
|
break;
|
|
default:
|
|
return NULL;
|
|
break;
|
|
}
|
|
|
|
if (last_template)
|
|
{
|
|
d_left (last_template) = ret_comp;
|
|
return last_template;
|
|
}
|
|
|
|
return ret_comp;
|
|
}
|
|
|
|
/* Return the name of the method whose linkage name is PHYSNAME. */
|
|
|
|
char *
|
|
method_name_from_physname (const char *physname)
|
|
{
|
|
void *storage = NULL;
|
|
char *demangled_name = NULL, *ret;
|
|
struct demangle_component *ret_comp;
|
|
struct demangle_parse_info *info;
|
|
|
|
info = mangled_name_to_comp (physname, DMGL_ANSI,
|
|
&storage, &demangled_name);
|
|
if (info == NULL)
|
|
return NULL;
|
|
|
|
ret_comp = unqualified_name_from_comp (info->tree);
|
|
|
|
ret = NULL;
|
|
if (ret_comp != NULL)
|
|
/* The ten is completely arbitrary; we don't have a good
|
|
estimate. */
|
|
ret = cp_comp_to_string (ret_comp, 10);
|
|
|
|
xfree (storage);
|
|
xfree (demangled_name);
|
|
cp_demangled_name_parse_free (info);
|
|
return ret;
|
|
}
|
|
|
|
/* If FULL_NAME is the demangled name of a C++ function (including an
|
|
arg list, possibly including namespace/class qualifications),
|
|
return a new string containing only the function name (without the
|
|
arg list/class qualifications). Otherwise, return NULL. The
|
|
caller is responsible for freeing the memory in question. */
|
|
|
|
char *
|
|
cp_func_name (const char *full_name)
|
|
{
|
|
char *ret;
|
|
struct demangle_component *ret_comp;
|
|
struct demangle_parse_info *info;
|
|
|
|
info = cp_demangled_name_to_comp (full_name, NULL);
|
|
if (!info)
|
|
return NULL;
|
|
|
|
ret_comp = unqualified_name_from_comp (info->tree);
|
|
|
|
ret = NULL;
|
|
if (ret_comp != NULL)
|
|
ret = cp_comp_to_string (ret_comp, 10);
|
|
|
|
cp_demangled_name_parse_free (info);
|
|
return ret;
|
|
}
|
|
|
|
/* DEMANGLED_NAME is the name of a function, including parameters and
|
|
(optionally) a return type. Return the name of the function without
|
|
parameters or return type, or NULL if we can not parse the name. */
|
|
|
|
char *
|
|
cp_remove_params (const char *demangled_name)
|
|
{
|
|
int done = 0;
|
|
struct demangle_component *ret_comp;
|
|
struct demangle_parse_info *info;
|
|
char *ret = NULL;
|
|
|
|
if (demangled_name == NULL)
|
|
return NULL;
|
|
|
|
info = cp_demangled_name_to_comp (demangled_name, NULL);
|
|
if (info == NULL)
|
|
return NULL;
|
|
|
|
/* First strip off any qualifiers, if we have a function or method. */
|
|
ret_comp = info->tree;
|
|
while (!done)
|
|
switch (ret_comp->type)
|
|
{
|
|
case DEMANGLE_COMPONENT_CONST:
|
|
case DEMANGLE_COMPONENT_RESTRICT:
|
|
case DEMANGLE_COMPONENT_VOLATILE:
|
|
case DEMANGLE_COMPONENT_CONST_THIS:
|
|
case DEMANGLE_COMPONENT_RESTRICT_THIS:
|
|
case DEMANGLE_COMPONENT_VOLATILE_THIS:
|
|
case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
|
|
ret_comp = d_left (ret_comp);
|
|
break;
|
|
default:
|
|
done = 1;
|
|
break;
|
|
}
|
|
|
|
/* What we have now should be a function. Return its name. */
|
|
if (ret_comp->type == DEMANGLE_COMPONENT_TYPED_NAME)
|
|
ret = cp_comp_to_string (d_left (ret_comp), 10);
|
|
|
|
cp_demangled_name_parse_free (info);
|
|
return ret;
|
|
}
|
|
|
|
/* Here are some random pieces of trivia to keep in mind while trying
|
|
to take apart demangled names:
|
|
|
|
- Names can contain function arguments or templates, so the process
|
|
has to be, to some extent recursive: maybe keep track of your
|
|
depth based on encountering <> and ().
|
|
|
|
- Parentheses don't just have to happen at the end of a name: they
|
|
can occur even if the name in question isn't a function, because
|
|
a template argument might be a type that's a function.
|
|
|
|
- Conversely, even if you're trying to deal with a function, its
|
|
demangled name might not end with ')': it could be a const or
|
|
volatile class method, in which case it ends with "const" or
|
|
"volatile".
|
|
|
|
- Parentheses are also used in anonymous namespaces: a variable
|
|
'foo' in an anonymous namespace gets demangled as "(anonymous
|
|
namespace)::foo".
|
|
|
|
- And operator names can contain parentheses or angle brackets. */
|
|
|
|
/* FIXME: carlton/2003-03-13: We have several functions here with
|
|
overlapping functionality; can we combine them? Also, do they
|
|
handle all the above considerations correctly? */
|
|
|
|
|
|
/* This returns the length of first component of NAME, which should be
|
|
the demangled name of a C++ variable/function/method/etc.
|
|
Specifically, it returns the index of the first colon 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'. */
|
|
|
|
/* NOTE: carlton/2003-03-13: This function is currently only intended
|
|
for internal use: it's probably not entirely safe when called on
|
|
user-generated input, because some of the 'index += 2' lines in
|
|
cp_find_first_component_aux might go past the end of malformed
|
|
input. */
|
|
|
|
unsigned int
|
|
cp_find_first_component (const char *name)
|
|
{
|
|
return cp_find_first_component_aux (name, 0);
|
|
}
|
|
|
|
/* Helper function for cp_find_first_component. Like that function,
|
|
it returns the length of the first component of NAME, but to make
|
|
the recursion easier, it also stops if it reaches an unexpected ')'
|
|
or '>' if the value of PERMISSIVE is nonzero. */
|
|
|
|
/* Let's optimize away calls to strlen("operator"). */
|
|
|
|
#define LENGTH_OF_OPERATOR 8
|
|
|
|
static unsigned int
|
|
cp_find_first_component_aux (const char *name, int permissive)
|
|
{
|
|
unsigned int index = 0;
|
|
/* Operator names can show up in unexpected places. Since these can
|
|
contain parentheses or angle brackets, they can screw up the
|
|
recursion. But not every string 'operator' is part of an
|
|
operater name: e.g. you could have a variable 'cooperator'. So
|
|
this variable tells us whether or not we should treat the string
|
|
'operator' as starting an operator. */
|
|
int operator_possible = 1;
|
|
|
|
for (;; ++index)
|
|
{
|
|
switch (name[index])
|
|
{
|
|
case '<':
|
|
/* Template; eat it up. The calls to cp_first_component
|
|
should only return (I hope!) when they reach the '>'
|
|
terminating the component or a '::' between two
|
|
components. (Hence the '+ 2'.) */
|
|
index += 1;
|
|
for (index += cp_find_first_component_aux (name + index, 1);
|
|
name[index] != '>';
|
|
index += cp_find_first_component_aux (name + index, 1))
|
|
{
|
|
if (name[index] != ':')
|
|
{
|
|
demangled_name_complaint (name);
|
|
return strlen (name);
|
|
}
|
|
index += 2;
|
|
}
|
|
operator_possible = 1;
|
|
break;
|
|
case '(':
|
|
/* Similar comment as to '<'. */
|
|
index += 1;
|
|
for (index += cp_find_first_component_aux (name + index, 1);
|
|
name[index] != ')';
|
|
index += cp_find_first_component_aux (name + index, 1))
|
|
{
|
|
if (name[index] != ':')
|
|
{
|
|
demangled_name_complaint (name);
|
|
return strlen (name);
|
|
}
|
|
index += 2;
|
|
}
|
|
operator_possible = 1;
|
|
break;
|
|
case '>':
|
|
case ')':
|
|
if (permissive)
|
|
return index;
|
|
else
|
|
{
|
|
demangled_name_complaint (name);
|
|
return strlen (name);
|
|
}
|
|
case '\0':
|
|
case ':':
|
|
return index;
|
|
case 'o':
|
|
/* Operator names can screw up the recursion. */
|
|
if (operator_possible
|
|
&& strncmp (name + index, "operator",
|
|
LENGTH_OF_OPERATOR) == 0)
|
|
{
|
|
index += LENGTH_OF_OPERATOR;
|
|
while (ISSPACE(name[index]))
|
|
++index;
|
|
switch (name[index])
|
|
{
|
|
/* Skip over one less than the appropriate number of
|
|
characters: the for loop will skip over the last
|
|
one. */
|
|
case '<':
|
|
if (name[index + 1] == '<')
|
|
index += 1;
|
|
else
|
|
index += 0;
|
|
break;
|
|
case '>':
|
|
case '-':
|
|
if (name[index + 1] == '>')
|
|
index += 1;
|
|
else
|
|
index += 0;
|
|
break;
|
|
case '(':
|
|
index += 1;
|
|
break;
|
|
default:
|
|
index += 0;
|
|
break;
|
|
}
|
|
}
|
|
operator_possible = 0;
|
|
break;
|
|
case ' ':
|
|
case ',':
|
|
case '.':
|
|
case '&':
|
|
case '*':
|
|
/* NOTE: carlton/2003-04-18: I'm not sure what the precise
|
|
set of relevant characters are here: it's necessary to
|
|
include any character that can show up before 'operator'
|
|
in a demangled name, and it's safe to include any
|
|
character that can't be part of an identifier's name. */
|
|
operator_possible = 1;
|
|
break;
|
|
default:
|
|
operator_possible = 0;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Complain about a demangled name that we don't know how to parse.
|
|
NAME is the demangled name in question. */
|
|
|
|
static void
|
|
demangled_name_complaint (const char *name)
|
|
{
|
|
complaint (&symfile_complaints,
|
|
"unexpected demangled name '%s'", name);
|
|
}
|
|
|
|
/* If NAME is the fully-qualified name of a C++
|
|
function/variable/method/etc., this returns the length of its
|
|
entire prefix: all of the namespaces 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. */
|
|
|
|
unsigned int
|
|
cp_entire_prefix_len (const char *name)
|
|
{
|
|
unsigned int current_len = cp_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 += 2;
|
|
current_len += cp_find_first_component (name + current_len);
|
|
}
|
|
|
|
return previous_len;
|
|
}
|
|
|
|
/* Overload resolution functions. */
|
|
|
|
/* Test to see if SYM is a symbol that we haven't seen corresponding
|
|
to a function named OLOAD_NAME. If so, add it to the current
|
|
completion list. */
|
|
|
|
static void
|
|
overload_list_add_symbol (struct symbol *sym,
|
|
const char *oload_name)
|
|
{
|
|
int newsize;
|
|
int i;
|
|
char *sym_name;
|
|
|
|
/* If there is no type information, we can't do anything, so
|
|
skip. */
|
|
if (SYMBOL_TYPE (sym) == NULL)
|
|
return;
|
|
|
|
/* skip any symbols that we've already considered. */
|
|
for (i = 0; i < sym_return_val_index; ++i)
|
|
if (strcmp (SYMBOL_LINKAGE_NAME (sym),
|
|
SYMBOL_LINKAGE_NAME (sym_return_val[i])) == 0)
|
|
return;
|
|
|
|
/* Get the demangled name without parameters */
|
|
sym_name = cp_remove_params (SYMBOL_NATURAL_NAME (sym));
|
|
if (!sym_name)
|
|
return;
|
|
|
|
/* skip symbols that cannot match */
|
|
if (strcmp (sym_name, oload_name) != 0)
|
|
{
|
|
xfree (sym_name);
|
|
return;
|
|
}
|
|
|
|
xfree (sym_name);
|
|
|
|
/* We have a match for an overload instance, so add SYM to the
|
|
current list of overload instances */
|
|
if (sym_return_val_index + 3 > sym_return_val_size)
|
|
{
|
|
newsize = (sym_return_val_size *= 2) * sizeof (struct symbol *);
|
|
sym_return_val = (struct symbol **)
|
|
xrealloc ((char *) sym_return_val, newsize);
|
|
}
|
|
sym_return_val[sym_return_val_index++] = sym;
|
|
sym_return_val[sym_return_val_index] = NULL;
|
|
}
|
|
|
|
/* Return a null-terminated list of pointers to function symbols that
|
|
are named FUNC_NAME and are visible within NAMESPACE. */
|
|
|
|
struct symbol **
|
|
make_symbol_overload_list (const char *func_name,
|
|
const char *the_namespace)
|
|
{
|
|
struct cleanup *old_cleanups;
|
|
const char *name;
|
|
|
|
sym_return_val_size = 100;
|
|
sym_return_val_index = 0;
|
|
sym_return_val = XNEWVEC (struct symbol *, sym_return_val_size + 1);
|
|
sym_return_val[0] = NULL;
|
|
|
|
old_cleanups = make_cleanup (xfree, sym_return_val);
|
|
|
|
make_symbol_overload_list_using (func_name, the_namespace);
|
|
|
|
if (the_namespace[0] == '\0')
|
|
name = func_name;
|
|
else
|
|
{
|
|
char *concatenated_name
|
|
= (char *) alloca (strlen (the_namespace) + 2 + strlen (func_name) + 1);
|
|
strcpy (concatenated_name, the_namespace);
|
|
strcat (concatenated_name, "::");
|
|
strcat (concatenated_name, func_name);
|
|
name = concatenated_name;
|
|
}
|
|
|
|
make_symbol_overload_list_qualified (name);
|
|
|
|
discard_cleanups (old_cleanups);
|
|
|
|
return sym_return_val;
|
|
}
|
|
|
|
/* Add all symbols with a name matching NAME in BLOCK to the overload
|
|
list. */
|
|
|
|
static void
|
|
make_symbol_overload_list_block (const char *name,
|
|
const struct block *block)
|
|
{
|
|
struct block_iterator iter;
|
|
struct symbol *sym;
|
|
|
|
ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
|
|
overload_list_add_symbol (sym, name);
|
|
}
|
|
|
|
/* Adds the function FUNC_NAME from NAMESPACE to the overload set. */
|
|
|
|
static void
|
|
make_symbol_overload_list_namespace (const char *func_name,
|
|
const char *the_namespace)
|
|
{
|
|
const char *name;
|
|
const struct block *block = NULL;
|
|
|
|
if (the_namespace[0] == '\0')
|
|
name = func_name;
|
|
else
|
|
{
|
|
char *concatenated_name
|
|
= (char *) alloca (strlen (the_namespace) + 2 + strlen (func_name) + 1);
|
|
|
|
strcpy (concatenated_name, the_namespace);
|
|
strcat (concatenated_name, "::");
|
|
strcat (concatenated_name, func_name);
|
|
name = concatenated_name;
|
|
}
|
|
|
|
/* Look in the static block. */
|
|
block = block_static_block (get_selected_block (0));
|
|
if (block)
|
|
make_symbol_overload_list_block (name, block);
|
|
|
|
/* Look in the global block. */
|
|
block = block_global_block (block);
|
|
if (block)
|
|
make_symbol_overload_list_block (name, block);
|
|
|
|
}
|
|
|
|
/* Search the namespace of the given type and namespace of and public
|
|
base types. */
|
|
|
|
static void
|
|
make_symbol_overload_list_adl_namespace (struct type *type,
|
|
const char *func_name)
|
|
{
|
|
char *the_namespace;
|
|
const char *type_name;
|
|
int i, prefix_len;
|
|
|
|
while (TYPE_CODE (type) == TYPE_CODE_PTR
|
|
|| TYPE_CODE (type) == TYPE_CODE_REF
|
|
|| TYPE_CODE (type) == TYPE_CODE_ARRAY
|
|
|| TYPE_CODE (type) == TYPE_CODE_TYPEDEF)
|
|
{
|
|
if (TYPE_CODE (type) == TYPE_CODE_TYPEDEF)
|
|
type = check_typedef(type);
|
|
else
|
|
type = TYPE_TARGET_TYPE (type);
|
|
}
|
|
|
|
type_name = TYPE_NAME (type);
|
|
|
|
if (type_name == NULL)
|
|
return;
|
|
|
|
prefix_len = cp_entire_prefix_len (type_name);
|
|
|
|
if (prefix_len != 0)
|
|
{
|
|
the_namespace = (char *) alloca (prefix_len + 1);
|
|
strncpy (the_namespace, type_name, prefix_len);
|
|
the_namespace[prefix_len] = '\0';
|
|
|
|
make_symbol_overload_list_namespace (func_name, the_namespace);
|
|
}
|
|
|
|
/* Check public base type */
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
|
|
for (i = 0; i < TYPE_N_BASECLASSES (type); i++)
|
|
{
|
|
if (BASETYPE_VIA_PUBLIC (type, i))
|
|
make_symbol_overload_list_adl_namespace (TYPE_BASECLASS (type,
|
|
i),
|
|
func_name);
|
|
}
|
|
}
|
|
|
|
/* Adds the overload list overload candidates for FUNC_NAME found
|
|
through argument dependent lookup. */
|
|
|
|
struct symbol **
|
|
make_symbol_overload_list_adl (struct type **arg_types, int nargs,
|
|
const char *func_name)
|
|
{
|
|
int i;
|
|
|
|
gdb_assert (sym_return_val_size != -1);
|
|
|
|
for (i = 1; i <= nargs; i++)
|
|
make_symbol_overload_list_adl_namespace (arg_types[i - 1],
|
|
func_name);
|
|
|
|
return sym_return_val;
|
|
}
|
|
|
|
/* 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;
|
|
}
|
|
|
|
/* This applies the using directives to add namespaces to search in,
|
|
and then searches for overloads in all of those namespaces. It
|
|
adds the symbols found to sym_return_val. Arguments are as in
|
|
make_symbol_overload_list. */
|
|
|
|
static void
|
|
make_symbol_overload_list_using (const char *func_name,
|
|
const char *the_namespace)
|
|
{
|
|
struct using_direct *current;
|
|
const struct block *block;
|
|
|
|
/* First, go through the using directives. If any of them apply,
|
|
look in the appropriate namespaces for new functions to match
|
|
on. */
|
|
|
|
for (block = get_selected_block (0);
|
|
block != NULL;
|
|
block = BLOCK_SUPERBLOCK (block))
|
|
for (current = block_using (block);
|
|
current != NULL;
|
|
current = current->next)
|
|
{
|
|
/* Prevent recursive calls. */
|
|
if (current->searched)
|
|
continue;
|
|
|
|
/* If this is a namespace alias or imported declaration ignore
|
|
it. */
|
|
if (current->alias != NULL || current->declaration != NULL)
|
|
continue;
|
|
|
|
if (strcmp (the_namespace, current->import_dest) == 0)
|
|
{
|
|
/* Mark this import as searched so that the recursive call
|
|
does not search it again. */
|
|
struct cleanup *old_chain;
|
|
current->searched = 1;
|
|
old_chain = make_cleanup (reset_directive_searched,
|
|
current);
|
|
|
|
make_symbol_overload_list_using (func_name,
|
|
current->import_src);
|
|
|
|
current->searched = 0;
|
|
discard_cleanups (old_chain);
|
|
}
|
|
}
|
|
|
|
/* Now, add names for this namespace. */
|
|
make_symbol_overload_list_namespace (func_name, the_namespace);
|
|
}
|
|
|
|
/* This does the bulk of the work of finding overloaded symbols.
|
|
FUNC_NAME is the name of the overloaded function we're looking for
|
|
(possibly including namespace info). */
|
|
|
|
static void
|
|
make_symbol_overload_list_qualified (const char *func_name)
|
|
{
|
|
struct compunit_symtab *cust;
|
|
struct objfile *objfile;
|
|
const struct block *b, *surrounding_static_block = 0;
|
|
|
|
/* Look through the partial symtabs for all symbols which begin by
|
|
matching FUNC_NAME. Make sure we read that symbol table in. */
|
|
|
|
ALL_OBJFILES (objfile)
|
|
{
|
|
if (objfile->sf)
|
|
objfile->sf->qf->expand_symtabs_for_function (objfile, func_name);
|
|
}
|
|
|
|
/* Search upwards from currently selected frame (so that we can
|
|
complete on local vars. */
|
|
|
|
for (b = get_selected_block (0); b != NULL; b = BLOCK_SUPERBLOCK (b))
|
|
make_symbol_overload_list_block (func_name, b);
|
|
|
|
surrounding_static_block = block_static_block (get_selected_block (0));
|
|
|
|
/* Go through the symtabs and check the externs and statics for
|
|
symbols which match. */
|
|
|
|
ALL_COMPUNITS (objfile, cust)
|
|
{
|
|
QUIT;
|
|
b = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), GLOBAL_BLOCK);
|
|
make_symbol_overload_list_block (func_name, b);
|
|
}
|
|
|
|
ALL_COMPUNITS (objfile, cust)
|
|
{
|
|
QUIT;
|
|
b = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), STATIC_BLOCK);
|
|
/* Don't do this block twice. */
|
|
if (b == surrounding_static_block)
|
|
continue;
|
|
make_symbol_overload_list_block (func_name, b);
|
|
}
|
|
}
|
|
|
|
/* Lookup the rtti type for a class name. */
|
|
|
|
struct type *
|
|
cp_lookup_rtti_type (const char *name, struct block *block)
|
|
{
|
|
struct symbol * rtti_sym;
|
|
struct type * rtti_type;
|
|
|
|
/* Use VAR_DOMAIN here as NAME may be a typedef. PR 18141, 18417.
|
|
Classes "live" in both STRUCT_DOMAIN and VAR_DOMAIN. */
|
|
rtti_sym = lookup_symbol (name, block, VAR_DOMAIN, NULL).symbol;
|
|
|
|
if (rtti_sym == NULL)
|
|
{
|
|
warning (_("RTTI symbol not found for class '%s'"), name);
|
|
return NULL;
|
|
}
|
|
|
|
if (SYMBOL_CLASS (rtti_sym) != LOC_TYPEDEF)
|
|
{
|
|
warning (_("RTTI symbol for class '%s' is not a type"), name);
|
|
return NULL;
|
|
}
|
|
|
|
rtti_type = check_typedef (SYMBOL_TYPE (rtti_sym));
|
|
|
|
switch (TYPE_CODE (rtti_type))
|
|
{
|
|
case TYPE_CODE_STRUCT:
|
|
break;
|
|
case TYPE_CODE_NAMESPACE:
|
|
/* chastain/2003-11-26: the symbol tables often contain fake
|
|
symbols for namespaces with the same name as the struct.
|
|
This warning is an indication of a bug in the lookup order
|
|
or a bug in the way that the symbol tables are populated. */
|
|
warning (_("RTTI symbol for class '%s' is a namespace"), name);
|
|
return NULL;
|
|
default:
|
|
warning (_("RTTI symbol for class '%s' has bad type"), name);
|
|
return NULL;
|
|
}
|
|
|
|
return rtti_type;
|
|
}
|
|
|
|
#ifdef HAVE_WORKING_FORK
|
|
|
|
/* If nonzero, attempt to catch crashes in the demangler and print
|
|
useful debugging information. */
|
|
|
|
static int catch_demangler_crashes = 1;
|
|
|
|
/* Stack context and environment for demangler crash recovery. */
|
|
|
|
static SIGJMP_BUF gdb_demangle_jmp_buf;
|
|
|
|
/* If nonzero, attempt to dump core from the signal handler. */
|
|
|
|
static int gdb_demangle_attempt_core_dump = 1;
|
|
|
|
/* Signal handler for gdb_demangle. */
|
|
|
|
static void
|
|
gdb_demangle_signal_handler (int signo)
|
|
{
|
|
if (gdb_demangle_attempt_core_dump)
|
|
{
|
|
if (fork () == 0)
|
|
dump_core ();
|
|
|
|
gdb_demangle_attempt_core_dump = 0;
|
|
}
|
|
|
|
SIGLONGJMP (gdb_demangle_jmp_buf, signo);
|
|
}
|
|
|
|
#endif
|
|
|
|
/* A wrapper for bfd_demangle. */
|
|
|
|
char *
|
|
gdb_demangle (const char *name, int options)
|
|
{
|
|
char *result = NULL;
|
|
int crash_signal = 0;
|
|
|
|
#ifdef HAVE_WORKING_FORK
|
|
#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
|
|
struct sigaction sa, old_sa;
|
|
#else
|
|
sighandler_t ofunc;
|
|
#endif
|
|
static int core_dump_allowed = -1;
|
|
|
|
if (core_dump_allowed == -1)
|
|
{
|
|
core_dump_allowed = can_dump_core (LIMIT_CUR);
|
|
|
|
if (!core_dump_allowed)
|
|
gdb_demangle_attempt_core_dump = 0;
|
|
}
|
|
|
|
if (catch_demangler_crashes)
|
|
{
|
|
#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
|
|
sa.sa_handler = gdb_demangle_signal_handler;
|
|
sigemptyset (&sa.sa_mask);
|
|
#ifdef HAVE_SIGALTSTACK
|
|
sa.sa_flags = SA_ONSTACK;
|
|
#else
|
|
sa.sa_flags = 0;
|
|
#endif
|
|
sigaction (SIGSEGV, &sa, &old_sa);
|
|
#else
|
|
ofunc = signal (SIGSEGV, gdb_demangle_signal_handler);
|
|
#endif
|
|
|
|
crash_signal = SIGSETJMP (gdb_demangle_jmp_buf);
|
|
}
|
|
#endif
|
|
|
|
if (crash_signal == 0)
|
|
result = bfd_demangle (NULL, name, options);
|
|
|
|
#ifdef HAVE_WORKING_FORK
|
|
if (catch_demangler_crashes)
|
|
{
|
|
#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
|
|
sigaction (SIGSEGV, &old_sa, NULL);
|
|
#else
|
|
signal (SIGSEGV, ofunc);
|
|
#endif
|
|
|
|
if (crash_signal != 0)
|
|
{
|
|
static int error_reported = 0;
|
|
|
|
if (!error_reported)
|
|
{
|
|
char *short_msg, *long_msg;
|
|
struct cleanup *back_to;
|
|
|
|
short_msg = xstrprintf (_("unable to demangle '%s' "
|
|
"(demangler failed with signal %d)"),
|
|
name, crash_signal);
|
|
back_to = make_cleanup (xfree, short_msg);
|
|
|
|
long_msg = xstrprintf ("%s:%d: %s: %s", __FILE__, __LINE__,
|
|
"demangler-warning", short_msg);
|
|
make_cleanup (xfree, long_msg);
|
|
|
|
target_terminal_ours ();
|
|
begin_line ();
|
|
if (core_dump_allowed)
|
|
fprintf_unfiltered (gdb_stderr,
|
|
_("%s\nAttempting to dump core.\n"),
|
|
long_msg);
|
|
else
|
|
warn_cant_dump_core (long_msg);
|
|
|
|
demangler_warning (__FILE__, __LINE__, "%s", short_msg);
|
|
|
|
do_cleanups (back_to);
|
|
|
|
error_reported = 1;
|
|
}
|
|
|
|
result = NULL;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Don't allow just "maintenance cplus". */
|
|
|
|
static void
|
|
maint_cplus_command (char *arg, int from_tty)
|
|
{
|
|
printf_unfiltered (_("\"maintenance cplus\" must be followed "
|
|
"by the name of a command.\n"));
|
|
help_list (maint_cplus_cmd_list,
|
|
"maintenance cplus ",
|
|
all_commands, gdb_stdout);
|
|
}
|
|
|
|
/* This is a front end for cp_find_first_component, for unit testing.
|
|
Be careful when using it: see the NOTE above
|
|
cp_find_first_component. */
|
|
|
|
static void
|
|
first_component_command (char *arg, int from_tty)
|
|
{
|
|
int len;
|
|
char *prefix;
|
|
|
|
if (!arg)
|
|
return;
|
|
|
|
len = cp_find_first_component (arg);
|
|
prefix = (char *) alloca (len + 1);
|
|
|
|
memcpy (prefix, arg, len);
|
|
prefix[len] = '\0';
|
|
|
|
printf_unfiltered ("%s\n", prefix);
|
|
}
|
|
|
|
extern initialize_file_ftype _initialize_cp_support; /* -Wmissing-prototypes */
|
|
|
|
|
|
/* Implement "info vtbl". */
|
|
|
|
static void
|
|
info_vtbl_command (char *arg, int from_tty)
|
|
{
|
|
struct value *value;
|
|
|
|
value = parse_and_eval (arg);
|
|
cplus_print_vtable (value);
|
|
}
|
|
|
|
void
|
|
_initialize_cp_support (void)
|
|
{
|
|
add_prefix_cmd ("cplus", class_maintenance,
|
|
maint_cplus_command,
|
|
_("C++ maintenance commands."),
|
|
&maint_cplus_cmd_list,
|
|
"maintenance cplus ",
|
|
0, &maintenancelist);
|
|
add_alias_cmd ("cp", "cplus",
|
|
class_maintenance, 1,
|
|
&maintenancelist);
|
|
|
|
add_cmd ("first_component",
|
|
class_maintenance,
|
|
first_component_command,
|
|
_("Print the first class/namespace component of NAME."),
|
|
&maint_cplus_cmd_list);
|
|
|
|
add_info ("vtbl", info_vtbl_command,
|
|
_("Show the virtual function table for a C++ object.\n\
|
|
Usage: info vtbl EXPRESSION\n\
|
|
Evaluate EXPRESSION and display the virtual function table for the\n\
|
|
resulting object."));
|
|
|
|
#ifdef HAVE_WORKING_FORK
|
|
add_setshow_boolean_cmd ("catch-demangler-crashes", class_maintenance,
|
|
&catch_demangler_crashes, _("\
|
|
Set whether to attempt to catch demangler crashes."), _("\
|
|
Show whether to attempt to catch demangler crashes."), _("\
|
|
If enabled GDB will attempt to catch demangler crashes and\n\
|
|
display the offending symbol."),
|
|
NULL,
|
|
NULL,
|
|
&maintenance_set_cmdlist,
|
|
&maintenance_show_cmdlist);
|
|
#endif
|
|
}
|