This patch applies the rule that functions defined in FOO.c must be declared in FOO.h. One of the worst offenders in the code base is tree.h, unsurprisingly. The patch creates several new headers: attribs.h calls.h fold-const.h gcc-symtab.h print-rtl.h print-tree.h stmt.h stor-layout.h stringpool.h tree-nested.h tree-object-size.h varasm.h. Functions in each corresponding .c file got moved to those headers and others that already existed. I wanted to make this patch as mechanical as possible, so I made no attempt to fix problems like having build_addr defined in tree-inline.c. I left that for later. There were some declarations that I could not move out of tree.h because of header poisoning or the use of target macros. We forbid the inclusion of things like expr.h from FE files. While that's a reasonable idea, the FE file *still* manage to at expr.c functionality because the declarations they want to use were defined in tree.h. The affected files are builtins.h, emit-rtl.h and expr.h. If that functionality is allowed to be accessed from the FEs, then I will later move those functions out of expr.c into tree.c. I have moved these declarations to the bottom of tree.h so they are easy to identify later. There is a namespace collision with libcpp. The file gcc/symtab.c cannot use gcc/symtab.h because the #include command picks up libcpp/include/symtab.h first. So I named this file gcc-symtab.h for now. Finally, I added a new header to PLUGIN_HEADERS to account for the tree.h refactoring. I did not add all headers factored out of tree.h because it is unclear (and impossible to tell) what plugins need. This adds the one header used by the plugins in the testsuite. This will be changing quite dramatically as we progress with the header refactoring. This patch should offer some minimal incremental build advantages by reducing the size of tree.h. Changes that would otherwise affected tree.h, will now go to other headers which are less frequently included. * tree.h: Include fold-const.h. (aggregate_value_p): Moved to function.h. (alloca_call_p): Moved to calls.h. (allocate_struct_function): Moved to function.h. (apply_tm_attr): Moved to attribs.h. (array_at_struct_end_p): Moved to expr.h. (array_ref_element_size): Moved to tree-dfa.h. (array_ref_low_bound): Moved to tree-dfa.h. (array_ref_up_bound): Moved to tree.h. (assemble_alias): Moved to cgraph.h. (bit_from_pos): Moved to stor-layout.h. (build_addr): Moved to tree-nested.h. (build_duplicate_type): Moved to tree-inline.h. (build_fold_addr_expr): Moved to fold-const.h. (build_fold_addr_expr_with_type): Moved to fold-const.h. (build_fold_addr_expr_with_type_loc): Moved to fold-const.h. (build_fold_indirect_ref): Moved to fold-const.h. (build_fold_indirect_ref_loc): Moved to fold-const.h. (build_personality_function): Moved to tree.h. (build_range_check): Moved to fold-const.h. (build_simple_mem_ref): Moved to fold-const.h. (build_simple_mem_ref_loc): Moved to fold-const.h. (build_tm_abort_call): Moved to trans-mem.h. (byte_from_pos): Moved to stor-layout.h. (call_expr_flags): Moved to calls.h. (can_move_by_pieces): Moved to expr.h. (categorize_ctor_elements): Moved to expr.h. (change_decl_assembler_name): Moved to gcc-symtab.h. (combine_comparisons): Moved to fold-const.h. (complete_ctor_at_level_p): Moved to tree.h. (component_ref_field_offset): Moved to tree-dfa.h. (compute_builtin_object_size): Moved to tree-object-size.h. (compute_record_mode): Moved to stor-layout.h. (constant_boolean_node): Moved to fold-const.h. (constructor_static_from_elts_p): Moved to varasm.h. (cxx11_attribute_p): Moved to attribs.h. (debug_body): Moved to print-tree.h. (debug_find_tree): Moved to tree-inline.h. (debug_fold_checksum): Moved to fold-const.h. (debug_head): Moved to print-tree.h. (debug_head): Moved to print-tree.h. (debug_raw): Moved to print-tree.h. (debug_tree): Moved to print-tree.h. (debug_vec_tree): Moved to print-tree.h. (debug_verbose): Moved to print-tree.h. (debug_verbose): Moved to print-tree.h. (decl_attributes): Moved to attribs.h. (decl_binds_to_current_def_p): Moved to varasm.h. (decl_default_tls_model): Moved to varasm.h. (decl_replaceable_p): Moved to varasm.h. (div_if_zero_remainder): Moved to fold-const.h. (double_int mem_ref_offset): Moved to fold-const.h. (dump_addr): Moved to print-tree.h. (element_precision): Moved to machmode.h. (expand_dummy_function_end): Moved to function.h. (expand_function_end): Moved to function.h. (expand_function_start): Moved to function.h. (expand_label): Moved to stmt.h. (expr_first): Moved to tree-iterator.h. (expr_last): Moved to tree-iterator.h. (finalize_size_functions): Moved to stor-layout.h. (finish_builtin_struct): Moved to stor-layout.h. (finish_record_layout): Moved to stor-layout.h. (fixup_signed_type): Moved to stor-layout.h. (fixup_unsigned_type): Moved to stor-layout.h. (flags_from_decl_or_type): Moved to calls.h. (fold): Moved to fold-const.h. (fold_abs_const): Moved to fold-const.h. (fold_binary): Moved to fold-const.h. (fold_binary_loc): Moved to fold-const.h. (fold_binary_to_constant): Moved to fold-const.h. (fold_build1): Moved to fold-const.h. (fold_build1_initializer_loc): Moved to fold-const.h. (fold_build1_loc): Moved to fold-const.h. (fold_build1_stat_loc): Moved to fold-const.h. (fold_build2): Moved to fold-const.h. (fold_build2_initializer_loc): Moved to fold-const.h. (fold_build2_loc): Moved to fold-const.h. (fold_build2_stat_loc): Moved to fold-const.h. (fold_build3): Moved to fold-const.h. (fold_build3_loc): Moved to fold-const.h. (fold_build3_stat_loc): Moved to fold-const.h. (fold_build_call_array): Moved to fold-const.h. (fold_build_call_array_initializer): Moved to fold-const.h. (fold_build_call_array_initializer_loc): Moved to fold-const.h. (fold_build_call_array_loc): Moved to fold-const.h. (fold_build_cleanup_point_expr): Moved to fold-const.h. (fold_convert): Moved to fold-const.h. (fold_convert_loc): Moved to fold-const.h. (fold_convertible_p): Moved to fold-const.h. (fold_defer_overflow_warnings): Moved to fold-const.h. (fold_deferring_overflow_warnings_p): Moved to fold-const.h. (fold_fma): Moved to fold-const.h. (fold_ignored_result): Moved to fold-const.h. (fold_indirect_ref): Moved to fold-const.h. (fold_indirect_ref_1): Moved to fold-const.h. (fold_indirect_ref_loc): Moved to fold-const.h. (fold_read_from_constant_string): Moved to fold-const.h. (fold_real_zero_addition_p): Moved to fold-const.h. (fold_single_bit_test): Moved to fold-const.h. (fold_strip_sign_ops): Moved to fold-const.h. (fold_ternary): Moved to fold-const.h. (fold_ternary_loc): Moved to fold-const.h. (fold_unary): Moved to tree-data-ref.h. (fold_unary_ignore_overflow): Moved to fold-const.h. (fold_unary_ignore_overflow_loc): Moved to fold-const.h. (fold_unary_loc): Moved to fold-const.h. (fold_unary_to_constant): Moved to fold-const.h. (fold_undefer_and_ignore_overflow_warnings): Moved to fold-const.h. (fold_undefer_overflow_warnings): Moved to fold-const.h. (folding_initializer): Moved to fold-const.h. (free_temp_slots): Moved to function.h. (generate_setjmp_warnings): Moved to function.h. (get_attribute_name): Moved to attribs.h. (get_identifier): Moved to stringpool.h. (get_identifier_with_length): Moved to stringpool.h. (get_inner_reference): Moved to tree.h. (gimple_alloca_call_p): Moved to calls.h. (gimplify_parameters): Moved to function.h. (highest_pow2_factor): Moved to expr.h. (indent_to): Moved to print-tree.h. (init_attributes): Moved to attribs.h. (init_dummy_function_start): Moved to function.h. (init_function_start): Moved to function.h. (init_inline_once): Moved to tree-inline.h. (init_object_sizes): Moved to tree-object-size.h. (init_temp_slots): Moved to function.h. (init_tree_optimization_optabs): Moved to optabs.h. (initialize_sizetypes): Moved to stor-layout.h. (initializer_constant_valid_for_bitfield_p): Moved to varasm.h. (initializer_constant_valid_p): Moved to varasm.h. (int_const_binop): Moved to fold-const.h. (internal_reference_types): Moved to stor-layout.h. (invert_tree_comparison): Moved to fold-const.h. (invert_truthvalue): Moved to fold-const.h. (invert_truthvalue_loc): Moved to fold-const.h. (is_tm_ending_fndecl): Moved to trans-mem.h. (is_tm_may_cancel_outer): Moved to trans-mem.h. (is_tm_pure): Moved to trans-mem.h. (is_tm_safe): Moved to trans-mem.h. (layout_decl): Moved to stor-layout.h. (layout_type): Moved to stor-layout.h. (lookup_attribute_spec): Moved to attribs.h. (make_accum_type): Moved to stor-layout.h. (make_decl_one_only): Moved to varasm.h. (make_decl_rtl): Moved to tree.h. (make_decl_rtl_for_debug): Moved to varasm.h. (make_fract_type): Moved to stor-layout.h. (make_or_reuse_sat_signed_accum_type): Moved to stor-layout.h. (make_or_reuse_sat_signed_fract_type): Moved to stor-layout.h. (make_or_reuse_sat_unsigned_accum_type): Moved to stor-layout.h. (make_or_reuse_sat_unsigned_fract_type): Moved to stor-layout.h. (make_or_reuse_signed_accum_type): Moved to stor-layout.h. (make_or_reuse_signed_fract_type): Moved to stor-layout.h. (make_or_reuse_unsigned_accum_type): Moved to stor-layout.h. (make_or_reuse_unsigned_fract_type): Moved to stor-layout.h. (make_range): Moved to fold-const.h. (make_range_step): Moved to fold-const.h. (make_sat_signed_accum_type): Moved to stor-layout.h. (make_sat_signed_fract_type): Moved to stor-layout.h. (make_sat_unsigned_accum_type): Moved to stor-layout.h. (make_sat_unsigned_fract_type): Moved to stor-layout.h. (make_signed_accum_type): Moved to stor-layout.h. (make_signed_fract_type): Moved to stor-layout.h. (make_signed_type): Moved to stor-layout.h. (make_unsigned_accum_type): Moved to stor-layout.h. (make_unsigned_fract_type): Moved to stor-layout.h. (make_unsigned_type): Moved to stor-layout.h. (mark_decl_referenced): Moved to varasm.h. (mark_referenced): Moved to varasm.h. (may_negate_without_overflow_p): Moved to fold-const.h. (maybe_get_identifier): Moved to stringpool.h. (merge_ranges): Moved to fold-const.h. (merge_weak): Moved to varasm.h. (mode_for_size_tree): Moved to stor-layout.h. (multiple_of_p): Moved to fold-const.h. (must_pass_in_stack_var_size): Moved to calls.h. (must_pass_in_stack_var_size_or_pad): Moved to calls.h. (native_encode_expr): Moved to fold-const.h. (native_interpret_expr): Moved to fold-const.h. (non_lvalue): Moved to fold-const.h. (non_lvalue_loc): Moved to fold-const.h. (normalize_offset): Moved to stor-layout.h. (normalize_rli): Moved to stor-layout.h. (notice_global_symbol): Moved to varasm.h. (omit_one_operand): Moved to fold-const.h. (omit_one_operand_loc): Moved to fold-const.h. (omit_two_operands): Moved to fold-const.h. (omit_two_operands_loc): Moved to fold-const.h. (operand_equal_p): Moved to tree-data-ref.h. (parse_input_constraint): Moved to stmt.h. (parse_output_constraint): Moved to stmt.h. (place_field): Moved to stor-layout.h. (pop_function_context): Moved to function.h. (pop_temp_slots): Moved to function.h. (pos_from_bit): Moved to stor-layout.h. (preserve_temp_slots): Moved to function.h. (print_node): Moved to print-tree.h. (print_node_brief): Moved to print-tree.h. (print_rtl): Moved to rtl.h. (process_pending_assemble_externals): Moved to varasm.h. (ptr_difference_const): Moved to fold-const.h. (push_function_context): Moved to function.h. (push_struct_function): Moved to function.h. (push_temp_slots): Moved to function.h. (record_tm_replacement): Moved to trans-mem.h. (relayout_decl): Moved to stor-layout.h. (resolve_asm_operand_names): Moved to stmt.h. (resolve_unique_section): Moved to varasm.h. (rli_size_so_far): Moved to stor-layout.h. (rli_size_unit_so_far): Moved to stor-layout.h. (round_down): Moved to fold-const.h. (round_down_loc): Moved to fold-const.h. (round_up): Moved to fold-const.h. (round_up_loc): Moved to fold-const.h. (set_decl_incoming_rtl): Moved to emit-rtl.h. (set_decl_rtl): Moved to tree.h. (set_min_and_max_values_for_integral_type): Moved to stor-layout.h. (set_user_assembler_name): Moved to varasm.h. (setjmp_call_p): Moved to calls.h. (size_binop): Moved to fold-const.h. (size_binop_loc): Moved to fold-const.h. (size_diffop): Moved to fold-const.h. (size_diffop_loc): Moved to fold-const.h. (size_int_kind): Moved to fold-const.h. (stack_protect_epilogue): Moved to function.h. (start_record_layout): Moved to stor-layout.h. (supports_one_only): Moved to varasm.h. (swap_tree_comparison): Moved to fold-const.h. (tm_malloc_replacement): Moved to trans-mem.h. (tree build_fold_addr_expr_loc): Moved to fold-const.h. (tree build_invariant_address): Moved to fold-const.h. (tree_binary_nonnegative_warnv_p): Moved to fold-const.h. (tree_binary_nonzero_warnv_p): Moved to fold-const.h. (tree_call_nonnegative_warnv_p): Moved to fold-const.h. (tree_expr_nonnegative_p): Moved to fold-const.h. (tree_expr_nonnegative_warnv_p): Moved to fold-const.h. (tree_output_constant_def): Moved to varasm.h. (tree_overlaps_hard_reg_set): Moved to stmt.h. (tree_single_nonnegative_warnv_p): Moved to fold-const.h. (tree_single_nonzero_warnv_p): Moved to fold-const.h. (tree_swap_operands_p): Moved to fold-const.h. (tree_unary_nonnegative_warnv_p): Moved to fold-const.h. (tree_unary_nonzero_warnv_p): Moved to fold-const.h. (update_alignment_for_field): Moved to stor-layout.h. (use_register_for_decl): Moved to function.h. (variable_size): Moved to rtl.h. (vector_type_mode): Moved to stor-layout.h. * cgraph.h: Corresponding changes. * emit-rtl.h: Corresponding changes. * expr.h: Corresponding changes. * function.h: Corresponding changes. * optabs.h: Corresponding changes. * trans-mem.h: Corresponding changes. Protect against multiple inclusion. * tree-inline.h: Corresponding changes. * tree-iterator.h: Corresponding changes. * tree-dfa.h: Include expr.h. * tree-ssanames.h: Include stringpool.h. * attribs.h: New file. * calls.h: New file. * fold-const.h: New file. * gcc-symtab.h: New file. * print-rtl.h: New file. * print-tree.h: New file. * stmt.h: New file. * stor-layout.h: New file. * strinpool.h: New file. * tree-nested.h: New file * tree-object-size.h: New file. * varasm.h: New file. * Makefile.in (PLUGIN_HEADERS): Add stringpool.h. * alias.c: Include varasm.h. Include expr.h. * asan.c: Include calls.h. Include stor-layout.h. Include varasm.h. * attribs.c: Include stringpool.h. Include attribs.h. Include stor-layout.h. * builtins.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. Include tree-object-size.h. * calls.c: Include stor-layout.h. Include varasm.h. Include stringpool.h. Include attribs.h. * cfgexpand.c: Include stringpool.h. Include varasm.h. Include stor-layout.h. Include stmt.h. Include print-tree.h. * cgraph.c: Include varasm.h. Include calls.h. Include print-tree.h. * cgraphclones.c: Include stringpool.h. Include function.h. Include emit-rtl.h. Move inclusion of rtl.h earlier in the file. * cgraphunit.c: Include varasm.h. Include stor-layout.h. Include stringpool.h. * cilk-common.c: Include stringpool.h. Include stor-layout.h. * combine.c: Include stor-layout.h. * config/aarch64/aarch64-builtins.c: Include stor-layout.h. Include stringpool.h. Include calls.h. * config/aarch64/aarch64.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. * config/alpha/alpha.c: Include stor-layout.h. Include calls.h. Include varasm.h. * config/arc/arc.c: Include varasm.h. Include stor-layout.h. Include stringpool.h. Include calls.h. * config/arm/arm.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. * config/avr/avr-c.c: Include stor-layout.h. * config/avr/avr-log.c: Include print-tree.h. * config/avr/avr.c: Include print-tree.h. Include calls.h. Include stor-layout.h. Include stringpool.h. * config/bfin/bfin.c: Include varasm.h. Include calls.h. * config/c6x/c6x.c: Include stor-layout.h. Include varasm.h. Include calls.h. Include stringpool.h. * config/cr16/cr16.c: Include stor-layout.h. Include calls.h. * config/cris/cris.c: Include varasm.h. Include stor-layout.h. Include calls.h. Include stmt.h. * config/darwin.c: Include stringpool.h. Include varasm.h. Include stor-layout.h. * config/epiphany/epiphany.c: Include stor-layout.h. Include varasm.h. Include calls.h. Include stringpool.h. * config/fr30/fr30.c: Include stor-layout.h. Include varasm.h. * config/frv/frv.c: Include varasm.h. Include stor-layout.h. Include stringpool.h. * config/h8300/h8300.c: Include stor-layout.h. Include varasm.h. Include calls.h. Include stringpool.h. * config/i386/i386.c: Include stringpool.h. Include attribs.h. Include calls.h. Include stor-layout.h. Include varasm.h. * config/i386/winnt-cxx.c: Include stringpool.h. Include attribs.h. * config/i386/winnt.c: Include stringpool.h. Include varasm.h. * config/ia64/ia64-c.c: Include stringpool.h. * config/ia64/ia64.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. * config/iq2000/iq2000.c: Include stor-layout.h. Include calls.h. Include varasm.h. * config/lm32/lm32.c: Include calls.h. * config/m32c/m32c.c: Include stor-layout.h. Include varasm.h. Include calls.h. * config/m32r/m32r.c: Include stor-layout.h. Include varasm.h. Include stringpool.h. Include calls.h. * config/m68k/m68k.c: Include calls.h. Include stor-layout.h. Include varasm.h. * config/mcore/mcore.c: Include stor-layout.h. Include varasm.h. Include stringpool.h. Include calls.h. * config/mep/mep.c: Include varasm.h. Include calls.h. Include stringpool.h. Include stor-layout.h. * config/microblaze/microblaze.c: Include varasm.h. Include stor-layout.h. Include calls.h. * config/mips/mips.c: Include varasm.h. Include stringpool.h. Include stor-layout.h. Include calls.h. * config/mmix/mmix.c: Include varasm.h. Include stor-layout.h. Include calls.h. * config/mn10300/mn10300.c: Include stor-layout.h. Include varasm.h. Include calls.h. * config/moxie/moxie.c: Include stor-layout.h. Include varasm.h. Include calls.h. * config/msp430/msp430.c: Include stor-layout.h. Include calls.h. * config/nds32/nds32.c: Include stor-layout.h. Include varasm.h. Include calls.h. * config/pa/pa.c: Include stor-layout.h. Include stringpool.h. Include varasm.h. Include calls.h. * config/pdp11/pdp11.c: Include stor-layout.h. Include varasm.h. Include calls.h. * config/picochip/picochip.c: Include calls.h. Include stor-layout.h. Include stringpool.h. Include varasm.h. * config/rl78/rl78.c: Include varasm.h. Include stor-layout.h. Include calls.h. * config/rs6000/rs6000-c.c: Include stor-layout.h. Include stringpool.h. * config/rs6000/rs6000.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include print-tree.h. Include varasm.h. * config/rx/rx.c: Include varasm.h. Include stor-layout.h. Include calls.h. * config/s390/s390.c: Include print-tree.h. Include stringpool.h. Include stor-layout.h. Include varasm.h. Include calls.h. * config/score/score.c: Include stringpool.h. Include calls.h. Include varasm.h. Include stor-layout.h. * config/sh/sh-c.c: Include stringpool.h. Include attribs.h.h. * config/sh/sh.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. * config/sol2-c.c: Include stringpool.h. Include attribs.h. * config/sol2-cxx.c: Include stringpool.h. * config/sol2.c: Include stringpool.h. Include varasm.h. * config/sparc/sparc.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. * config/spu/spu-c.c: Include stringpool.h. * config/spu/spu.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. * config/stormy16/stormy16.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. Include calls.h. * config/tilegx/tilegx.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. Include calls.h. * config/tilepro/tilepro.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. Include calls.h. * config/v850/v850-c.c: Include stringpool.h. Include attribs.h. * config/v850/v850.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. Include calls.h. * config/vax/vax.c: Include calls.h. Include varasm.h. * config/vms/vms.c: Include stringpool.h. * config/vxworks.c: Include stringpool.h. * config/xtensa/xtensa.c: Include stringpool.h. Include stor-layout.h. Include calls.h. Include varasm.h. * convert.c: Include stor-layout.h. * coverage.c: Include stringpool.h. Include stor-layout.h. * dbxout.c: Include varasm.h. Include stor-layout.h. * dojump.c: Include stor-layout.h. * dse.c: Include stor-layout.h. * dwarf2asm.c: Include stringpool.h. Include varasm.h. * dwarf2cfi.c: Include stor-layout.h. * dwarf2out.c: Include rtl.h. Include stringpool.h. Include stor-layout.h. Include varasm.h. Include function.h. Include emit-rtl.h. Move inclusion of rtl.h earlier in the file. * emit-rtl.c: Include varasm.h. * except.c: Include stringpool.h. Include stor-layout.h. * explow.c: Include stor-layout.h. * expmed.c: Include stor-layout.h. * expr.c: Include stringpool.h. Include stor-layout.h. Include attribs.h. Include varasm.h. * final.c: Include varasm.h. * fold-const.c: Include stor-layout.h. Include calls.h. Include tree-iterator.h. * function.c: Include stor-layout.h. Include varasm.h. Include stringpool.h. * genattrtab.c (write_header): Emit includes for varasm.h, stor-layout.h and calls.h. * genautomata.c (main): Likewise. * genemit.c: Likewise. * genopinit.c: Likewise. * genoutput.c (output_prologue): Likewise. * genpeep.c: Likewise. * genpreds.c (write_insn_preds_c): Likewise. * gengtype.c (open_base_files): Add stringpool.h. * gimple-expr.c: Include stringpool.h. Include stor-layout.h. * gimple-fold.c: Include stringpool.h. Include expr.h. Include stmt.h. Include stor-layout.h. * gimple-low.c: Include tree-nested.h. Include calls.h. * gimple-pretty-print.c: Include stringpool.h. * gimple-ssa-strength-reduction.c: Include stor-layout.h. Include expr.h. * gimple-walk.c: Include stmt.h. * gimple.c: Include calls.h. Include stmt.h. Include stor-layout.h. * gimplify.c: Include stringpool.h. Include calls.h. Include varasm.h. Include stor-layout.h. Include stmt.h. Include print-tree.h. Include expr.h. * gimplify-me.c: Include stmt.h Include stor-layout.h * internal-fn.c: Include stor-layout.h. * ipa-devirt.c: Include print-tree.h. Include calls.h. * ipa-inline-analysis.c: Include stor-layout.h. Include stringpool.h. Include print-tree.h. * ipa-inline.c: Include trans-mem.h. Include calls.h. * ipa-prop.c: Include expr.h. Include stor-layout.h. Include print-tree.h. * ipa-pure-const.c: Include print-tree.h. Include calls.h. * ipa-reference.c: Include calls.h. * ipa-split.c: Include stringpool.h. Include expr.h. Include calls.h. * ipa.c: Include calls.h. Include stringpool.h. * langhooks.c: Include stringpool.h. Include attribs.h. * lto-cgraph.c: Include stringpool.h. * lto-streamer-in.c: Include stringpool.h. * lto-streamer-out.c: Include stor-layout.h. Include stringpool.h. * omp-low.c: Include stringpool.h. Include stor-layout.h. Include expr.h. * optabs.c: Include stor-layout.h. Include stringpool.h. Include varasm.h. * passes.c: Include varasm.h. * predict.c: Include calls.h. * print-rtl.c: Include print-tree.h. * print-tree.c: Include varasm.h. Include print-rtl.h. Include stor-layout.h. * realmpfr.c: Include stor-layout.h. * reg-stack.c: Include varasm.h. * sdbout.c: Include varasm.h. Include stor-layout.h. * simplify-rtx.c: Include varasm.h. * stmt.c: Include varasm.h. Include stor-layout.h. * stor-layout.c: Include stor-layout.h. Include stringpool.h. Include varasm.h. Include print-tree.h. * symtab.c: Include rtl.h. Include print-tree.h. Include varasm.h. Include function.h. Include emit-rtl.h. * targhooks.c: Include stor-layout.h. Include varasm.h. * toplev.c: Include varasm.h. Include tree-inline.h. * trans-mem.c: Include calls.h. Include function.h. Include rtl.h. Include emit-rtl.h. * tree-affine.c: Include expr.h. * tree-browser.c: Include print-tree.h. * tree-call-cdce.c: Include stor-layout.h. * tree-cfg.c: Include trans-mem.h. Include stor-layout.h. Include print-tree.h. * tree-complex.c: Include stor-layout.h. * tree-data-ref.c: Include expr.h. * tree-dfa.c: Include stor-layout.h. * tree-eh.c: Include expr.h. Include calls.h. * tree-emutls.c: Include stor-layout.h. Include varasm.h. * tree-if-conv.c: Include stor-layout.h. * tree-inline.c: Include stor-layout.h. Include calls.h. * tree-loop-distribution.c: Include stor-layout.h. * tree-nested.c: Include stringpool.h. Include stor-layout.h. * tree-object-size.c: Include tree-object-size.h. * tree-outof-ssa.c: Include stor-layout.h. * tree-parloops.c: Include stor-layout.h. Include tree-nested.h. * tree-pretty-print.c: Include stor-layout.h. Include expr.h. * tree-profile.c: Include varasm.h. Include tree-nested.h. * tree-scalar-evolution.c: Include expr.h. * tree-sra.c: Include stor-layout.h. * tree-ssa-address.c: Include stor-layout.h. * tree-ssa-ccp.c: Include stor-layout.h. * tree-ssa-dce.c: Include calls.h. * tree-ssa-dom.c: Include stor-layout.h. * tree-ssa-forwprop.c: Include stor-layout.h. * tree-ssa-ifcombine.c: Include stor-layout.h. * tree-ssa-loop-ivopts.c: Include stor-layout.h. * tree-ssa-loop-niter.c: Include calls.h. Include expr.h. * tree-ssa-loop-prefetch.c: Include stor-layout.h. * tree-ssa-math-opts.c: Include stor-layout.h. * tree-ssa-operands.c: Include stmt.h. Include print-tree.h. * tree-ssa-phiopt.c: Include stor-layout.h. * tree-ssa-reassoc.c: Include stor-layout.h. * tree-ssa-sccvn.c: Include stor-layout.h. * tree-ssa-sink.c: Include stor-layout.h. * tree-ssa-strlen.c: Include stor-layout.h. * tree-ssa-structalias.c: Include stor-layout.h. Include stmt.h. * tree-ssa-tail-merge.c: Include stor-layout.h. Include trans-mem.h. * tree-ssa-uncprop.c: Include stor-layout.h. * tree-ssa.c: Include stor-layout.h. * tree-ssanames.c: Include stor-layout.h. * tree-streamer-in.c: Include stringpool.h. * tree-streamer-out.c: Include stor-layout.h. * tree-switch-conversion.c: Include varasm.h. Include stor-layout.h. * tree-tailcall.c: Include stor-layout.h. * tree-vect-data-refs.c: Include stor-layout.h. * tree-vect-generic.c: Include stor-layout.h. * tree-vect-loop.c: Include stor-layout.h. * tree-vect-patterns.c: Include stor-layout.h. * tree-vect-slp.c: Include stor-layout.h. * tree-vect-stmts.c: Include stor-layout.h. * tree-vectorizer.c: Include stor-layout.h. * tree-vrp.c: Include stor-layout.h. Include calls.h. * tree.c: Include stor-layout.h. Include calls.h. Include attribs.h. Include varasm.h. * tsan.c: Include expr.h. * ubsan.c: Include stor-layout.h. Include stringpool.h. * value-prof.c: Include tree-nested.h. Include calls.h. * var-tracking.c: Include varasm.h. Include stor-layout.h. * varasm.c: Include stor-layout.h. Include stringpool.h. Include gcc-symtab.h. Include varasm.h. * varpool.c: Include varasm.h. * vmsdbgout.c: Include varasm.h. * xcoffout.c: Include varasm.h. ada/ChangeLog * gcc-interface/decl.c: Include stringpool.h Include stor-layout.h * gcc-interface/misc.c: Include stor-layout.h Include print-tree.h * gcc-interface/trans.c: Include stringpool.h Include stor-layout.h Include stmt.h Include varasm.h * gcc-interface/utils.c: Include stringpool.h Include stor-layout.h Include attribs.h Include varasm.h * gcc-interface/utils2.c: Include stringpool.h Include stor-layout.h Include attribs.h Include varasm.h c-family/ChangeLog * c-common.c: Include fold-const.h. Include stor-layout.h. Include calls.h. Include stringpool.h. Include attribs.h. Include varasm.h. Include trans-mem.h. * c-cppbuiltin.c: Include stor-layout.h. Include stringpool.h. * c-format.c: Include stringpool.h. * c-lex.c: Include stringpool.h. Include stor-layout.h. * c-pragma.c: Include stringpool.h. Include attribs.h. Include varasm.h. Include gcc-symtab.h. * c-pretty-print.c: Include stor-layout.h. Include attribs.h. * cilk.c: Include stringpool.h. Include calls.h. c/ChangeLog * c-decl.c: Include print-tree.h. Include stor-layout.h. Include varasm.h. Include attribs.h. Include stringpool.h. * c-lang.c: Include fold-const.h. * c-parser.c: Include stringpool.h. Include attribs.h. Include stor-layout.h. Include varasm.h. Include trans-mem.h. * c-typeck.c: Include stor-layout.h. Include trans-mem.h. Include varasm.h. Include stmt.h. cp/ChangeLog * call.c: Include stor-layout.h. Include trans-mem.h. Include stringpool.h. * class.c: Include stringpool.h. Include stor-layout.h. Include attribs.h. * cp-gimplify.c: Include stor-layout.h. * cvt.c: Include stor-layout.h. * decl.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. Include attribs.h. Include calls.h. * decl2.c: Include stringpool.h. Include varasm.h. Include attribs.h. Include stor-layout.h. Include calls.h. * error.c: Include stringpool.h. * except.c: Include stringpool.h. Include trans-mem.h. Include attribs.h. * init.c: Include stringpool.h. Include varasm.h. * lambda.c: Include stringpool.h. * lex.c: Include stringpool.h. * mangle.c: Include stor-layout.h. Include stringpool.h. * method.c: Include stringpool.h. Include varasm.h. * name-lookup.c: Include stringpool.h. Include print-tree.h. Include attribs.h. * optimize.c: Include stringpool.h. * parser.c: Include print-tree.h. Include stringpool.h. Include attribs.h. Include trans-mem.h. * pt.c: Include stringpool.h. Include varasm.h. Include attribs.h. Include stor-layout.h. * ptree.c: Include print-tree.h. * repo.c: Include stringpool.h. * rtti.c: Include stringpool.h. Include stor-layout.h. * semantics.c: Include stmt.h. Include varasm.h. Include stor-layout.h. Include stringpool.h. * tree.c: Include stor-layout.h. Include print-tree.h. Include tree-iterator.h. * typeck.c: Include stor-layout.h. Include varasm.h. * typeck2.c: Include stor-layout.h. Include varasm.h. * vtable-class-hierarchy.c: Include stringpool.h. Include stor-layout.h. fortran/ChangeLog * decl.c: Include stringpool.h. * iresolve.c: Include stringpool.h. * match.c: Include stringpool.h. * module.c: Include stringpool.h. * target-memory.c: Include stor-layout.h. * trans-common.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. * trans-const.c: Include stor-layout.h. * trans-decl.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. Include attribs.h. * trans-expr.c: Include stringpool.h. * trans-intrinsic.c: Include stringpool.h. Include tree-nested.h. Include stor-layout.h. * trans-io.c: Include stringpool.h. Include stor-layout.h. * trans-openmp.c: Include stringpool.h. * trans-stmt.c: Include stringpool.h. * trans-types.c: Include stor-layout.h. Include stringpool.h. * trans.c: Include stringpool.h. go/ChangeLog * go-backend.c: Include stor-layout.h. * go-gcc.cc: Include stringpool.h. Include stor-layout.h. Include varasm.h. * go-lang.c: Include stor-layout.h. java/ChangeLog * builtins.c: Include stor-layout.h. Include stringpool.h. * class.c: Include stringpool.h. Include stor-layout.h. Include varasm.h. * constants.c: Include stringpool.h. Include stor-layout.h. * decl.c: Include stor-layout.h. Include stringpool.h. Include varasm.h. * except.c: Include stringpool.h. Include stor-layout.h. * expr.c: Include stringpool.h. Include stor-layout.h. * jcf-parse.c: Include stringpool.h. * mangle.c: Include stringpool.h. * resource.c: Include stringpool.h. Include stor-layout.h. * typeck.c: Include stor-layout.h. Include stringpool.h. * verify-glue.c: Include stringpool.h. lto/ChangeLog * lto-lang.c: Include stringpool.h. Include stor-layout.h. * lto-partition.c: Include gcc-symtab.h. * lto.c: Include stor-layout.h. objc/ChangeLog * objc-act.c: Include stringpool.h. Include stor-layout.h. Include attribs.h. * objc-encoding.c: Include stringpool.h. Include stor-layout.h. * objc-gnu-runtime-abi-01.c: Include stringpool.h. * objc-next-runtime-abi-01.c: Include stringpool.h. * objc-next-runtime-abi-02.c: Include stringpool.h. * objc-runtime-shared-support.c: Include stringpool.h. testsuite/ChangeLog * gcc.dg/plugin/selfassign.c: Include stringpool.h. * gcc.dg/plugin/start_unit_plugin.c: Likewise. From-SVN: r205023
721 lines
20 KiB
C
721 lines
20 KiB
C
/* Functions related to mangling class names for the GNU compiler
|
|
for the Java(TM) language.
|
|
Copyright (C) 1998-2013 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC 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, or (at your option)
|
|
any later version.
|
|
|
|
GCC 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 GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
Java and all Java-based marks are trademarks or registered trademarks
|
|
of Sun Microsystems, Inc. in the United States and other countries.
|
|
The Free Software Foundation is independent of Sun Microsystems, Inc. */
|
|
|
|
/* Written by Per Bothner <bothner@cygnus.com> */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "jcf.h"
|
|
#include "tree.h"
|
|
#include "stringpool.h"
|
|
#include "java-tree.h"
|
|
#include "obstack.h"
|
|
#include "diagnostic-core.h"
|
|
#include "ggc.h"
|
|
#include "langhooks-def.h"
|
|
|
|
static void mangle_class_field (tree);
|
|
static void mangle_vtable (tree);
|
|
static void mangle_field_decl (tree);
|
|
static void mangle_method_decl (tree);
|
|
static void mangle_local_cni_method_decl (tree);
|
|
|
|
static void mangle_type (tree);
|
|
static void mangle_pointer_type (tree);
|
|
static void mangle_array_type (tree);
|
|
static int mangle_record_type (tree, int);
|
|
|
|
static int find_compression_pointer_match (tree);
|
|
static int find_compression_array_match (tree);
|
|
static int find_compression_record_match (tree, tree *);
|
|
static int find_compression_array_template_match (tree);
|
|
|
|
static void set_type_package_list (tree);
|
|
static int entry_match_pointer_p (tree, int);
|
|
static void emit_compression_string (int);
|
|
|
|
static void init_mangling (void);
|
|
static tree finish_mangling (void);
|
|
static void compression_table_add (tree);
|
|
|
|
static void mangle_member_name (tree);
|
|
|
|
static struct obstack mangle_obstack_1;
|
|
struct obstack *mangle_obstack;
|
|
|
|
#define MANGLE_RAW_STRING(S) \
|
|
obstack_grow (mangle_obstack, (S), sizeof (S)-1)
|
|
|
|
/* atms: array template mangled string. */
|
|
static GTY(()) tree atms;
|
|
|
|
/* This is the mangling interface: a decl, a class field (.class) and
|
|
the vtable. */
|
|
|
|
void
|
|
java_mangle_decl (tree decl)
|
|
{
|
|
/* A copy of the check from the beginning of lhd_set_decl_assembler_name.
|
|
Only FUNCTION_DECLs and VAR_DECLs for variables with static storage
|
|
duration need a real DECL_ASSEMBLER_NAME. */
|
|
gcc_assert (TREE_CODE (decl) == FUNCTION_DECL
|
|
|| (TREE_CODE (decl) == VAR_DECL
|
|
&& (TREE_STATIC (decl)
|
|
|| DECL_EXTERNAL (decl)
|
|
|| TREE_PUBLIC (decl))));
|
|
|
|
/* Mangling only applies to class members. */
|
|
if (DECL_CONTEXT (decl) && TYPE_P (DECL_CONTEXT (decl)))
|
|
{
|
|
init_mangling ();
|
|
switch (TREE_CODE (decl))
|
|
{
|
|
case VAR_DECL:
|
|
if (DECL_LANG_SPECIFIC (decl))
|
|
{
|
|
if (DECL_CLASS_FIELD_P (decl))
|
|
{
|
|
mangle_class_field (decl);
|
|
break;
|
|
}
|
|
else if (DECL_VTABLE_P (decl))
|
|
{
|
|
mangle_vtable (DECL_CONTEXT (decl));
|
|
break;
|
|
}
|
|
}
|
|
mangle_field_decl (decl);
|
|
break;
|
|
|
|
case FUNCTION_DECL:
|
|
if (DECL_LANG_SPECIFIC (decl) && DECL_LOCAL_CNI_METHOD_P (decl))
|
|
mangle_local_cni_method_decl (decl);
|
|
else
|
|
mangle_method_decl (decl);
|
|
break;
|
|
|
|
default:
|
|
gcc_unreachable ();
|
|
}
|
|
SET_DECL_ASSEMBLER_NAME (decl, finish_mangling ());
|
|
}
|
|
else
|
|
lhd_set_decl_assembler_name (decl);
|
|
}
|
|
|
|
/* Beginning of the helper functions */
|
|
|
|
static void
|
|
mangle_class_field (tree decl)
|
|
{
|
|
tree type = DECL_CONTEXT (decl);
|
|
mangle_record_type (type, /* for_pointer = */ 0);
|
|
if (TREE_CODE (TREE_TYPE (decl)) == RECORD_TYPE)
|
|
MANGLE_RAW_STRING ("6class$");
|
|
else
|
|
MANGLE_RAW_STRING ("7class$$");
|
|
obstack_1grow (mangle_obstack, 'E');
|
|
}
|
|
|
|
static void
|
|
mangle_vtable (tree type)
|
|
{
|
|
MANGLE_RAW_STRING ("TV");
|
|
mangle_record_type (type, /* for_pointer = */ 0);
|
|
obstack_1grow (mangle_obstack, 'E');
|
|
}
|
|
|
|
/* This mangles a field decl */
|
|
|
|
static void
|
|
mangle_field_decl (tree decl)
|
|
{
|
|
/* Mangle the name of the this the field belongs to */
|
|
mangle_record_type (DECL_CONTEXT (decl), /* for_pointer = */ 0);
|
|
|
|
/* Mangle the name of the field */
|
|
mangle_member_name (DECL_NAME (decl));
|
|
|
|
/* Terminate the mangled name */
|
|
obstack_1grow (mangle_obstack, 'E');
|
|
}
|
|
|
|
/* This mangles a method decl, first mangling its name and then all
|
|
its arguments. */
|
|
|
|
static void
|
|
mangle_method_decl (tree mdecl)
|
|
{
|
|
tree method_name = DECL_NAME (mdecl);
|
|
tree arglist;
|
|
|
|
/* Mangle the name of the type that contains mdecl */
|
|
mangle_record_type (DECL_CONTEXT (mdecl), /* for_pointer = */ 0);
|
|
|
|
/* Mangle the function name. There are two cases:
|
|
- mdecl is a constructor, use `C1' for its name, (denotes a
|
|
complete object constructor.)
|
|
- mdecl is not a constructor, standard mangling is performed.
|
|
We terminate the mangled function name with a `E'. */
|
|
if (ID_INIT_P (method_name))
|
|
obstack_grow (mangle_obstack, "C1", 2);
|
|
else
|
|
mangle_member_name (method_name);
|
|
obstack_1grow (mangle_obstack, 'E');
|
|
|
|
/* We mangled type.methodName. Now onto the arguments. */
|
|
arglist = TYPE_ARG_TYPES (TREE_TYPE (mdecl));
|
|
if (TREE_CODE (TREE_TYPE (mdecl)) == METHOD_TYPE)
|
|
arglist = TREE_CHAIN (arglist);
|
|
|
|
/* Output literal 'J' and mangle the return type IF not a
|
|
constructor. */
|
|
if (!ID_INIT_P (method_name))
|
|
{
|
|
obstack_1grow (mangle_obstack, 'J');
|
|
mangle_type(TREE_TYPE(TREE_TYPE(mdecl)));
|
|
}
|
|
|
|
/* No arguments is easy. We shortcut it. */
|
|
if (arglist == end_params_node)
|
|
obstack_1grow (mangle_obstack, 'v');
|
|
else
|
|
{
|
|
tree arg;
|
|
for (arg = arglist; arg != end_params_node; arg = TREE_CHAIN (arg))
|
|
mangle_type (TREE_VALUE (arg));
|
|
}
|
|
}
|
|
|
|
/* This mangles a CNI method for a local class. If the target supports
|
|
hidden aliases, then G++ will have generated one for us. It is the
|
|
responsibility of java_mark_class_local to check target support, since
|
|
we need to set DECL_VISIBILITY (or not) much earlier. */
|
|
|
|
static void
|
|
mangle_local_cni_method_decl (tree decl)
|
|
{
|
|
MANGLE_RAW_STRING ("GA");
|
|
mangle_method_decl (decl);
|
|
}
|
|
|
|
/* This mangles a member name, like a function name or a field
|
|
name. Handle cases were `name' is a C++ keyword. Return a nonzero
|
|
value if unicode encoding was required. */
|
|
|
|
static void
|
|
mangle_member_name (tree name)
|
|
{
|
|
append_gpp_mangled_name (IDENTIFIER_POINTER (name),
|
|
IDENTIFIER_LENGTH (name));
|
|
}
|
|
|
|
/* Append the mangled name of TYPE onto OBSTACK. */
|
|
|
|
static void
|
|
mangle_type (tree type)
|
|
{
|
|
switch (TREE_CODE (type))
|
|
{
|
|
char code;
|
|
case BOOLEAN_TYPE: code = 'b'; goto primitive;
|
|
case VOID_TYPE: code = 'v'; goto primitive;
|
|
case INTEGER_TYPE:
|
|
if (type == char_type_node || type == promoted_char_type_node)
|
|
{
|
|
code = 'w';
|
|
goto primitive;
|
|
}
|
|
/* Get the original type instead of the arguments promoted type.
|
|
Avoid symbol name clashes. Should call a function to do that.
|
|
FIXME. */
|
|
if (type == promoted_short_type_node)
|
|
type = short_type_node;
|
|
if (type == promoted_byte_type_node)
|
|
type = byte_type_node;
|
|
switch (TYPE_PRECISION (type))
|
|
{
|
|
case 8: code = 'c'; goto primitive;
|
|
case 16: code = 's'; goto primitive;
|
|
case 32: code = 'i'; goto primitive;
|
|
case 64: code = 'x'; goto primitive;
|
|
default: goto bad_type;
|
|
}
|
|
primitive:
|
|
obstack_1grow (mangle_obstack, code);
|
|
break;
|
|
|
|
case REAL_TYPE:
|
|
switch (TYPE_PRECISION (type))
|
|
{
|
|
case 32: code = 'f'; goto primitive;
|
|
case 64: code = 'd'; goto primitive;
|
|
default: goto bad_type;
|
|
}
|
|
case POINTER_TYPE:
|
|
if (TYPE_ARRAY_P (TREE_TYPE (type)))
|
|
mangle_array_type (type);
|
|
else
|
|
mangle_pointer_type (type);
|
|
break;
|
|
bad_type:
|
|
default:
|
|
gcc_unreachable ();
|
|
}
|
|
}
|
|
|
|
/* The compression table is a vector that keeps track of things we've
|
|
already seen, so they can be reused. For example, java.lang.Object
|
|
would generate three entries: two package names and a type. If
|
|
java.lang.String is presented next, the java.lang will be matched
|
|
against the first two entries (and kept for compression as S0_), and
|
|
type String would be added to the table. See mangle_record_type.
|
|
COMPRESSION_NEXT is the index to the location of the next insertion
|
|
of an element. */
|
|
|
|
static GTY(()) tree compression_table;
|
|
static int compression_next;
|
|
|
|
/* Find a POINTER_TYPE in the compression table. Use a special
|
|
function to match pointer entries and start from the end */
|
|
|
|
static int
|
|
find_compression_pointer_match (tree type)
|
|
{
|
|
int i;
|
|
|
|
for (i = compression_next-1; i >= 0; i--)
|
|
if (entry_match_pointer_p (type, i))
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
/* Already recorder arrays are handled like pointer as they're always
|
|
associated with it. */
|
|
|
|
static int
|
|
find_compression_array_match (tree type)
|
|
{
|
|
return find_compression_pointer_match (type);
|
|
}
|
|
|
|
/* Match the table of type against STRING. */
|
|
|
|
static int
|
|
find_compression_array_template_match (tree string)
|
|
{
|
|
int i;
|
|
for (i = 0; i < compression_next; i++)
|
|
if (TREE_VEC_ELT (compression_table, i) == string)
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
/* We go through the compression table and try to find a complete or
|
|
partial match. The function returns the compression table entry
|
|
that (eventually partially) matches TYPE. *NEXT_CURRENT can be set
|
|
to the rest of TYPE to be mangled. */
|
|
|
|
static int
|
|
find_compression_record_match (tree type, tree *next_current)
|
|
{
|
|
int i, match = -1;
|
|
tree current, saved_current = NULL_TREE;
|
|
|
|
current = TYPE_PACKAGE_LIST (type);
|
|
|
|
for (i = 0; i < compression_next; i++)
|
|
{
|
|
tree compression_entry = TREE_VEC_ELT (compression_table, i);
|
|
if (current && compression_entry == TREE_PURPOSE (current))
|
|
{
|
|
match = i;
|
|
saved_current = current;
|
|
current = TREE_CHAIN (current);
|
|
}
|
|
else
|
|
/* We don't want to match an element that appears in the middle
|
|
of a package name, so skip forward to the next complete type name.
|
|
IDENTIFIER_NODEs (except for a "6JArray") are partial package
|
|
names while RECORD_TYPEs represent complete type names. */
|
|
while (i < compression_next
|
|
&& TREE_CODE (compression_entry) == IDENTIFIER_NODE
|
|
&& compression_entry != atms)
|
|
compression_entry = TREE_VEC_ELT (compression_table, ++i);
|
|
}
|
|
|
|
if (!next_current)
|
|
return match;
|
|
|
|
/* If we have a match, set next_current to the item next to the last
|
|
matched value. */
|
|
if (match >= 0)
|
|
*next_current = TREE_CHAIN (saved_current);
|
|
/* We had no match: we'll have to start from the beginning. */
|
|
if (match < 0)
|
|
*next_current = TYPE_PACKAGE_LIST (type);
|
|
|
|
return match;
|
|
}
|
|
|
|
/* Mangle a record type. If a nonzero value is returned, it means
|
|
that a 'N' was emitted (so that a matching 'E' can be emitted if
|
|
necessary.) FOR_POINTER indicates that this element is for a pointer
|
|
symbol, meaning it was preceded by a 'P'. */
|
|
|
|
static int
|
|
mangle_record_type (tree type, int for_pointer)
|
|
{
|
|
tree current;
|
|
int match;
|
|
int nadded_p = 0;
|
|
int qualified;
|
|
|
|
/* Does this name have a package qualifier? */
|
|
qualified = QUALIFIED_P (DECL_NAME (TYPE_NAME (type)));
|
|
|
|
#define ADD_N() \
|
|
do { obstack_1grow (mangle_obstack, 'N'); nadded_p = 1; } while (0)
|
|
|
|
gcc_assert (TREE_CODE (type) == RECORD_TYPE);
|
|
|
|
if (!TYPE_PACKAGE_LIST (type))
|
|
set_type_package_list (type);
|
|
|
|
match = find_compression_record_match (type, ¤t);
|
|
if (match >= 0)
|
|
{
|
|
/* If we had a pointer, and there's more, we need to emit
|
|
'N' after 'P' (for_pointer tells us we already emitted it.) */
|
|
if (for_pointer && current)
|
|
ADD_N();
|
|
emit_compression_string (match);
|
|
}
|
|
while (current)
|
|
{
|
|
/* Add the new type to the table */
|
|
compression_table_add (TREE_PURPOSE (current));
|
|
/* Add 'N' if we never got a chance to, but only if we have a qualified
|
|
name. For non-pointer elements, the name is always qualified. */
|
|
if ((qualified || !for_pointer) && !nadded_p)
|
|
ADD_N();
|
|
/* Use the bare type name for the mangle. */
|
|
append_gpp_mangled_name (IDENTIFIER_POINTER (TREE_VALUE (current)),
|
|
IDENTIFIER_LENGTH (TREE_VALUE (current)));
|
|
current = TREE_CHAIN (current);
|
|
}
|
|
return nadded_p;
|
|
#undef ADD_N
|
|
}
|
|
|
|
/* Mangle a pointer type. There are two cases: the pointer is already
|
|
in the compression table: the compression is emitted sans 'P'
|
|
indicator. Otherwise, a 'P' is emitted and, depending on the type,
|
|
a partial compression or/plus the rest of the mangling. */
|
|
|
|
static void
|
|
mangle_pointer_type (tree type)
|
|
{
|
|
int match;
|
|
tree pointer_type;
|
|
|
|
/* Search for the type already in the compression table */
|
|
if ((match = find_compression_pointer_match (type)) >= 0)
|
|
{
|
|
emit_compression_string (match);
|
|
return;
|
|
}
|
|
|
|
/* This didn't work. We start by mangling the pointed-to type */
|
|
pointer_type = type;
|
|
type = TREE_TYPE (type);
|
|
gcc_assert (TREE_CODE (type) == RECORD_TYPE);
|
|
|
|
obstack_1grow (mangle_obstack, 'P');
|
|
if (mangle_record_type (type, /* for_pointer = */ 1))
|
|
obstack_1grow (mangle_obstack, 'E');
|
|
|
|
/* Don't forget to insert the pointer type in the table */
|
|
compression_table_add (pointer_type);
|
|
}
|
|
|
|
/* Mangle an array type. Search for an easy solution first, then go
|
|
through the process of finding out whether the bare array type or even
|
|
the template indicator were already used and compressed appropriately.
|
|
It handles pointers. */
|
|
|
|
static void
|
|
mangle_array_type (tree p_type)
|
|
{
|
|
tree type, elt_type;
|
|
int match;
|
|
|
|
type = TREE_TYPE (p_type);
|
|
gcc_assert (type);
|
|
|
|
elt_type = TYPE_ARRAY_ELEMENT (type);
|
|
|
|
/* We cache a bit of the Jarray <> mangle. */
|
|
if (!atms)
|
|
{
|
|
atms = get_identifier ("6JArray");
|
|
}
|
|
|
|
/* Maybe we have what we're looking for in the compression table. */
|
|
if ((match = find_compression_array_match (p_type)) >= 0)
|
|
{
|
|
emit_compression_string (match);
|
|
return;
|
|
}
|
|
|
|
/* We know for a fact that all arrays are pointers */
|
|
obstack_1grow (mangle_obstack, 'P');
|
|
/* Maybe we already have a Jarray<t> somewhere. PSx_ will be enough. */
|
|
if ((match = find_compression_record_match (type, NULL)) > 0)
|
|
{
|
|
emit_compression_string (match);
|
|
return;
|
|
}
|
|
|
|
/* Maybe we already have just JArray somewhere */
|
|
if ((match = find_compression_array_template_match (atms)) > 0)
|
|
emit_compression_string (match);
|
|
else
|
|
{
|
|
/* Start the template mangled name */
|
|
obstack_grow (mangle_obstack,
|
|
IDENTIFIER_POINTER (atms), IDENTIFIER_LENGTH (atms));
|
|
/* Insert in the compression table */
|
|
compression_table_add (atms);
|
|
}
|
|
|
|
/* Mangle Jarray <elt_type> */
|
|
obstack_1grow (mangle_obstack, 'I');
|
|
mangle_type (elt_type);
|
|
obstack_1grow (mangle_obstack, 'E');
|
|
|
|
/* Add `Jarray <elt_type>' and `Jarray <elt_type> *' to the table */
|
|
compression_table_add (type);
|
|
compression_table_add (p_type);
|
|
}
|
|
|
|
/* Write a substitution string for entry I. Substitution string starts a
|
|
-1 (encoded S_.) The base is 36, and the code shamelessly taken from
|
|
cp/mangle.c. */
|
|
|
|
static void
|
|
emit_compression_string (int i)
|
|
{
|
|
i -= 1; /* Adjust */
|
|
obstack_1grow (mangle_obstack, 'S');
|
|
if (i >= 0)
|
|
{
|
|
static const char digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
|
unsigned HOST_WIDE_INT n;
|
|
unsigned HOST_WIDE_INT m=1;
|
|
/* How many digits for I in base 36? */
|
|
for (n = i; n >= 36; n /= 36, m *=36);
|
|
/* Write the digits out */
|
|
while (m > 0)
|
|
{
|
|
int digit = i / m;
|
|
obstack_1grow (mangle_obstack, digits [digit]);
|
|
i -= digit * m;
|
|
m /= 36;
|
|
}
|
|
}
|
|
obstack_1grow (mangle_obstack, '_');
|
|
}
|
|
|
|
/* If search the compression table at index I for a pointer type
|
|
equivalent to TYPE (meaning that after all the indirection, which
|
|
might all be unique, we find the same RECORD_TYPE.) */
|
|
|
|
static int
|
|
entry_match_pointer_p (tree type, int i)
|
|
{
|
|
tree t = TREE_VEC_ELT (compression_table, i);
|
|
|
|
while (TREE_CODE (type) == POINTER_TYPE
|
|
&& TREE_CODE (t) == POINTER_TYPE)
|
|
{
|
|
t = TREE_TYPE (t);
|
|
type = TREE_TYPE (type);
|
|
}
|
|
return (TREE_CODE (type) == RECORD_TYPE
|
|
&& TREE_CODE (t) == RECORD_TYPE
|
|
&& t == type);
|
|
}
|
|
|
|
/* Go through all qualification of type and build a list of list node
|
|
elements containings as a purpose what should be used for a match and
|
|
inserted in the compression table; and as it value the raw name of the
|
|
part. The result is stored in TYPE_PACKAGE_LIST to be reused. */
|
|
|
|
static void
|
|
set_type_package_list (tree type)
|
|
{
|
|
int i;
|
|
const char *type_string = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)));
|
|
const char *ptr;
|
|
int qualifications;
|
|
tree list = NULL_TREE, elt;
|
|
|
|
for (ptr = type_string, qualifications = 0; *ptr; ptr++)
|
|
if (*ptr == '.')
|
|
qualifications += 1;
|
|
|
|
for (ptr = type_string, i = 0; i < qualifications; ptr++)
|
|
{
|
|
if (ptr [0] == '.')
|
|
{
|
|
tree const identifier
|
|
= get_identifier_with_length (type_string, ptr - type_string);
|
|
|
|
elt = build_tree_list (identifier, identifier);
|
|
TREE_CHAIN (elt) = list;
|
|
list = elt;
|
|
type_string = ptr+1;
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
elt = build_tree_list (type, get_identifier (type_string));
|
|
TREE_CHAIN (elt) = list;
|
|
list = elt;
|
|
TYPE_PACKAGE_LIST (type) = nreverse (list);
|
|
}
|
|
|
|
/* Add TYPE as the last element of the compression table. Resize the
|
|
compression table if necessary. */
|
|
|
|
static void
|
|
compression_table_add (tree type)
|
|
{
|
|
if (compression_next == TREE_VEC_LENGTH (compression_table))
|
|
{
|
|
tree new_table = make_tree_vec (2*compression_next);
|
|
int i;
|
|
|
|
for (i = 0; i < compression_next; i++)
|
|
TREE_VEC_ELT (new_table, i) = TREE_VEC_ELT (compression_table, i);
|
|
|
|
compression_table = new_table;
|
|
}
|
|
TREE_VEC_ELT (compression_table, compression_next++) = type;
|
|
}
|
|
|
|
/* Mangle an embedded resource file name. "_ZGr" is the prefix. A
|
|
'_' is prepended to the name so that names starting with a digit
|
|
can be demangled. The length and then the resulting name itself
|
|
are appended while escaping '$', '.', and '/' to: "$$", "$_", and
|
|
"$S". */
|
|
|
|
tree
|
|
java_mangle_resource_name (const char *name)
|
|
{
|
|
int len = strlen (name);
|
|
char *buf = (char *) alloca (2 * len + 1);
|
|
char *pos;
|
|
const unsigned char *w1 = (const unsigned char *) name;
|
|
const unsigned char *w2;
|
|
const unsigned char *limit = w1 + len;
|
|
|
|
pos = buf;
|
|
|
|
init_mangling ();
|
|
MANGLE_RAW_STRING ("Gr");
|
|
|
|
*pos++ = '_';
|
|
while (w1 < limit)
|
|
{
|
|
int ch;
|
|
w2 = w1;
|
|
ch = UTF8_GET (w1, limit);
|
|
gcc_assert (ch > 0);
|
|
switch (ch)
|
|
{
|
|
case '$':
|
|
*pos++ = '$';
|
|
*pos++ = '$';
|
|
break;
|
|
case '.':
|
|
*pos++ = '$';
|
|
*pos++ = '_';
|
|
break;
|
|
case '/':
|
|
*pos++ = '$';
|
|
*pos++ = 'S';
|
|
break;
|
|
default:
|
|
memcpy (pos, w2, w1 - w2);
|
|
pos += w1 - w2;
|
|
break;
|
|
}
|
|
}
|
|
append_gpp_mangled_name (buf, pos - buf);
|
|
|
|
return finish_mangling ();
|
|
}
|
|
|
|
/* Mangling initialization routine. */
|
|
|
|
static void
|
|
init_mangling (void)
|
|
{
|
|
if (!mangle_obstack)
|
|
{
|
|
mangle_obstack = &mangle_obstack_1;
|
|
gcc_obstack_init (mangle_obstack);
|
|
}
|
|
|
|
gcc_assert (compression_table == NULL);
|
|
compression_table = make_tree_vec (10);
|
|
|
|
/* Mangled name are to be suffixed */
|
|
MANGLE_RAW_STRING ("_Z");
|
|
}
|
|
|
|
/* Mangling finalization routine. The mangled name is returned as a
|
|
IDENTIFIER_NODE. */
|
|
|
|
static tree
|
|
finish_mangling (void)
|
|
{
|
|
tree result;
|
|
|
|
gcc_assert (compression_table);
|
|
|
|
compression_table = NULL_TREE;
|
|
compression_next = 0;
|
|
obstack_1grow (mangle_obstack, '\0');
|
|
result = get_identifier (obstack_base (mangle_obstack));
|
|
obstack_free (mangle_obstack, obstack_base (mangle_obstack));
|
|
|
|
return result;
|
|
}
|
|
|
|
#include "gt-java-mangle.h"
|