2004-05-13 08:41:07 +02:00
|
|
|
|
/* Exception handling semantics and decomposition for trees.
|
2009-02-20 16:20:38 +01:00
|
|
|
|
Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
|
|
|
Free Software Foundation, Inc.
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
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
|
2007-07-26 10:37:01 +02:00
|
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
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
|
2007-07-26 10:37:01 +02:00
|
|
|
|
along with GCC; see the file COPYING3. If not see
|
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
#include "system.h"
|
|
|
|
|
#include "coretypes.h"
|
|
|
|
|
#include "tm.h"
|
|
|
|
|
#include "tree.h"
|
|
|
|
|
#include "rtl.h"
|
|
|
|
|
#include "tm_p.h"
|
|
|
|
|
#include "flags.h"
|
|
|
|
|
#include "function.h"
|
|
|
|
|
#include "except.h"
|
|
|
|
|
#include "tree-flow.h"
|
|
|
|
|
#include "tree-dump.h"
|
|
|
|
|
#include "tree-inline.h"
|
|
|
|
|
#include "tree-iterator.h"
|
|
|
|
|
#include "tree-pass.h"
|
|
|
|
|
#include "timevar.h"
|
|
|
|
|
#include "langhooks.h"
|
|
|
|
|
#include "ggc.h"
|
basic-block.h, [...]: Don't include errors.h and include toplev.h if necessary.
* basic-block.h, bb-reorder.c, c-gimplify.c, config/darwin.c,
config/rs6000/rs6000-c.c, dominance.c, gimple-low.c, gimplify.c,
lambda-code.c, lambda-trans.c, tree-browser.c, tree-cfg.c,
tree-chrec.c, tree-data-ref.c, tree-dfa.c, tree-eh.c,
tree-if-conv.c, tree-into-ssa.c, tree-loop-linear.c,
tree-mudflap.c, tree-nomudflap.c, tree-outof-ssa.c,
tree-pretty-print.c, tree-scalar-evolution.c, tree-sra.c,
tree-ssa-ccp.c, tree-ssa-copy.c, tree-ssa-dce.c, tree-ssa-dom.c,
tree-ssa-dse.c, tree-ssa-forwprop.c, tree-ssa-live.c,
tree-ssa-operands.c, tree-ssa-phiopt.c, tree-ssa-pre.c,
tree-ssa-propagate.c, tree-ssa-sink.c, tree-ssa-threadupdate.c,
tree-ssa-uncprop.c, tree-ssa.c, tree-vect-analyze.c,
tree-vect-transform.c, tree-vectorizer.c, vec.c: Don't include
errors.h and include toplev.h if necessary.
* rtl.c, varray.c: If we're compiling as a GENERATOR_FILE, include
errors.h otherwise include toplev.h.
* Makefile.in: Update dependencies.
ada:
* misc.c: Don't include errors.h.
fortran:
* fortran/trans-decl.c: Don't include errors.h.
* fortran/Make-lang.in: Updates dependencies.
java:
* java/verify-glue.c: Don't include errors.h and include toplev.h.
* java/Make-lang.in: Updates dependencies.
treelang:
* treelang/lex.l, treelang/parse.y: Don't include errors.h and
include toplev.h.
* treelang/Make-lang.in: Updates dependencies.
From-SVN: r100420
2005-06-01 04:51:18 +02:00
|
|
|
|
#include "toplev.h"
|
2008-07-28 16:33:56 +02:00
|
|
|
|
#include "gimple.h"
|
|
|
|
|
|
|
|
|
|
/* In some instances a tree and a gimple need to be stored in a same table,
|
|
|
|
|
i.e. in hash tables. This is a structure to do this. */
|
|
|
|
|
typedef union {tree *tp; tree t; gimple g;} treemple;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
cfgcleanup.c (try_simplify_condjump): Don't remove line notes to avoid unreachable code warnings.
* cfgcleanup.c (try_simplify_condjump): Don't remove line
notes to avoid unreachable code warnings.
* toplev.c (backend_init): Don't emit line notes for
unreachable code warnings.
* combine.c (distribute_notes): Don't distribute a
REG_VTABLE_REF note.
* final.c (final_scan_insn): Don't handle it.
* rtl.c (reg_note_name): Remove it.
* rtl.h (enum reg_node): Dito.
* emit-rtl.c (force_line_numbers, restore_line_number_status):
Remove.
* rtl.h (force_line_numbers, restore_line_number_status):
Remove prototypes.
* stmt.c (using_eh_for_cleanups_p, using_eh_for_cleanups): Move...
* tree-eh.c (using_eh_for_cleanups_p): ...here. Make static.
(using_eh_for_cleanups): Also moved here.
* expr.c (expand_expr_real_1) <CASE_LABEL_EXPR>: Die if we see one.
<SWITCH_EXPR>: Die if we have a non-NULL SWITCH_BODY. Update calls
to expand_start_case and add_case_node.
* stmt.c (struct nesting): Cleanup unused fields condition_code,
last_unconditional_cleanup, nominal_type, printname, and
line_number_status.
(struct fixup_goto): Remove.
(struct stmt_status): Remove x_goto_fixup_chain field.
(goto_fixup_chain): Remove.
(strip_default_case_nodes, group_case_nodes, emit_jump_if_reachable,
pushcase, pushcase_range): Remove.
(expand_start_bindings_and_block): Don't set unused fields in
the nesting stack.
(expand_start_case, add_case_node): Cleanup unused formal arguments.
(expand_end_case_type): Don't simplify the case-list. Use emit_jump
instead of emit_jump_if_reachable.
(emit_case_nodes): Likewise.
* tree-cfg.c (group_case_labels, cleanup_dead_labels): No longer
static.
(update_eh_label): Work around left-over exception handing regions.
* tree-flow.h (group_case_labels, cleanup_dead_labels): Add protos.
* tree-optimize.c (execute_cleanup_cfg_post_optimizing): New function.
(pass_cleanup_cfg_post_optimizing): New pass.
(init_tree_optimization_passes): Run the new pass after all
optimizations.
* tree.h (pushcase, pushcase_range): Remove prototypes.
(expand_start_case, add_case_node): Update prototypes.
cp/
* cp-tree.h (struct lang_type): Don't have three GTY options on a
single bit GTY desc.
java/
* parse.y (java_complete_expand_methods, java_expand_classes): Don't
abuse restore_line_number_status.
From-SVN: r84849
2004-07-17 02:31:15 +02:00
|
|
|
|
/* Nonzero if we are using EH to handle cleanups. */
|
|
|
|
|
static int using_eh_for_cleanups_p = 0;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
using_eh_for_cleanups (void)
|
|
|
|
|
{
|
|
|
|
|
using_eh_for_cleanups_p = 1;
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* Misc functions used in this file. */
|
|
|
|
|
|
|
|
|
|
/* Compare and hash for any structure which begins with a canonical
|
cgraphunit.c, [...]: Fix comment typos.
* cgraphunit.c, dbxout.c, flow.c, gcse.c, gimplify.c,
lambda-code.c, loop.c, machmode.def, mips-tfile.c,
modulo-sched.c, passes.c, postreload-gcse.c, tree-eh.c,
tree-ssa-ccp.c, varasm.c, config/frv/frv.c, config/frv/frv.h,
config/frv/frv.md, config/i386/i386.c, config/i386/i386.h,
config/i386/i386.md, config/rs6000/predicates.md,
config/rs6000/rs6000.c, config/s390/fixdfdi.h,
config/s390/s390.c, config/stormy16/stormy16.c,
config/stormy16/stormy16.md, config/vax/vax.md: Fix comment
typos.
From-SVN: r97362
2005-04-01 05:42:55 +02:00
|
|
|
|
pointer. Assumes all pointers are interchangeable, which is sort
|
2004-05-13 08:41:07 +02:00
|
|
|
|
of already assumed by gcc elsewhere IIRC. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
struct_ptr_eq (const void *a, const void *b)
|
|
|
|
|
{
|
2005-12-18 02:19:20 +01:00
|
|
|
|
const void * const * x = (const void * const *) a;
|
|
|
|
|
const void * const * y = (const void * const *) b;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return *x == *y;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static hashval_t
|
|
|
|
|
struct_ptr_hash (const void *a)
|
|
|
|
|
{
|
2005-12-18 02:19:20 +01:00
|
|
|
|
const void * const * x = (const void * const *) a;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return (size_t)*x >> 4;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* Remember and lookup EH region data for arbitrary statements.
|
|
|
|
|
Really this means any statement that could_throw_p. We could
|
|
|
|
|
stuff this information into the stmt_ann data structure, but:
|
|
|
|
|
|
|
|
|
|
(1) We absolutely rely on this information being kept until
|
|
|
|
|
we get to rtl. Once we're done with lowering here, if we lose
|
|
|
|
|
the information there's no way to recover it!
|
|
|
|
|
|
2004-08-19 23:34:37 +02:00
|
|
|
|
(2) There are many more statements that *cannot* throw as
|
2004-05-13 08:41:07 +02:00
|
|
|
|
compared to those that can. We should be saving some amount
|
|
|
|
|
of space by only allocating memory for those that can throw. */
|
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
record_stmt_eh_region (struct eh_region *region, gimple t)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
if (!region)
|
|
|
|
|
return;
|
|
|
|
|
|
2005-05-14 16:27:09 +02:00
|
|
|
|
add_stmt_to_eh_region (t, get_eh_region_number (region));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Add statement T in function IFUN to EH region NUM. */
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
add_stmt_to_eh_region_fn (struct function *ifun, gimple t, int num)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct throw_stmt_node *n;
|
|
|
|
|
void **slot;
|
|
|
|
|
|
targhooks.c (default_unwind_emit, [...]): Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* targhooks.c (default_unwind_emit, default_scalar_mode_supported_p):
Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* timevar.c (timevar_push, timevar_pop, timevar_start,
timevar_stop): Likewise.
* toplev.c (default_pch_valid_p): Likewise.
* tracer.c (tail_duplicate): Likewise.
* tree-alias-common.c (get_alias_var_decl,
get_values_from_constructor, create_alias_var, delete_alias_vars,
empty_points_to_set, same_points_to_set, ptr_may_alias_var):
Likewise.
* tree.c (tree_size, make_node_stat, copy_node_stat,
build_int_cst_wide, integer_all_onesp, list_length, chainon,
tree_node_structure, type_contains_placeholder_p, substitute_in_expr,
substitute_placeholder_in_expr, tabilize_reference_1, build0_stat,
build1_stat, build2_stat, build3_stat, build4_stat, is_attribute_p,
lookup_attribute, type_hash_canon, host_integerp, iterative_hash_expr,
build_method_type_directly, decl_type_context, get_callee_fndecl,
get_set_constructor_bits, build_vector_type_for_mode, int_cst_value,
tree_fold_gcd): Likewise.
* tree-cfg.c (create_bb, make_ctrl_stmt_edges, make_exit_edges,
make_cond_expr_edges, group_case_labels, tree_merge_blocks,
cleanup_control_expr_graph, find_taken_edge,
find_taken_edge_switch_expr, phi_alternatives_equal,
is_ctrl_altering_stmt, disband_implicit_edges, set_bb_for_stmt,
stmt_for_bsi, tree_find_edge_insert_loc, bsi_insert_on_edge_immediate,
tree_split_edge, tree_verify_flow_info, thread_jumps,
tree_redirect_edge_and_branch, tree_flow_call_edges_add): Likewise.
* tree-chrec.c (chrec_fold_poly_cst, chrec_fold_plus_poly_poly,
chrec_fold_multiply_poly_poly): Likewise.
* tree-complex.c (extract_component, expand_complex_division,
expand_complex_comparison, expand_complex_operations_1,
build_replicated_const, expand_vector_operations_1): Likewise.
* tree-data-ref.c (tree_fold_bezout, build_classic_dist_vector,
build_classic_dir_vector): Likewise.
* tree-dfa.c (compute_immediate_uses_for_phi,
compute_immediate_uses_for_stmt, create_var_ann, create_stmt_ann,
create_tree_ann, collect_dfa_stats, get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-eh.c (record_stmt_eh_region, add_stmt_to_eh_region,
record_in_finally_tree, replace_goto_queue_1,
maybe_record_in_goto_queue, verify_norecord_switch_expr,
do_return_redirection): Likewise.
* tree-if-conv.c (tree_if_convert_stmt, tree_if_convert_cond_expr,
add_to_dst_predicate_list, find_phi_replacement_condition,
replace_phi_with_cond_modify_expr, get_loop_body_in_if_conv_order):
Likewise.
* tree-inline.c (remap_decl, remap_type, remap_decls, copy_body_r,
initialize_inlined_parameters, declare_return_variable,
estimate_num_insns_1, expand_call_inline, expand_calls_inline,
optimize_inline_calls, copy_tree_r): Likewise.
* tree-into-ssa.c (rewrite_initialize_block_local_data, rewrite_stmt,
ssa_rewrite_stmt, rewrite_into_ssa): Likewise.
* tree-iterator.c (alloc_stmt_list, tsi_link_before, tsi_link_after,
tsi_split_statement_list_after, tsi_split_statement_list_before):
Likewise.
* tree-mudflap.c (mf_varname_tree): Likewise.
* tree-nested.c (create_tmp_var_for, lookup_field_for_decl,
lookup_tramp_for_decl, convert_all_function_calls): Likewise.
* tree-optimize.c (tree_rest_of_compilation): Likewise.
* tree-outof-ssa.c (create_temp, eliminate_build, eliminate_phi,
coalesce_abnormal_edges, coalesce_ssa_name, eliminate_virtual_phis,
free_temp_expr_table, add_dependance, finish_expr, rewrite_trees):
Likewise.
* tree-phinodes.c (resize_phi_node, add_phi_arg,
remove_all_phi_nodes_for): Likewise.
* tree-pretty-print.c (op_prio, print_call_name): Likewise.
* tree-profile.c (tree_gen_interval_profiler, tree_gen_pow2_profiler,
tree_gen_one_value_profiler, tree_gen_const_delta_profiler): Likewise.
* tree-sra.c (type_can_instantiate_all_elements, sra_hash_tree,
sra_elt_eq, sra_walk_expr, instantiate_missing_elements,
generate_one_element_ref, generate_element_copy,
generate_element_zero, scalarize_copy, scalarize_init,
scalarize_ldst): Likewise.
* tree-ssa-alias.c (delete_alias_info, group_aliases, may_alias_p,
add_may_alias, add_pointed_to_expr, add_pointed_to_var,
collect_points_to_info_r, get_tmt_for, get_ptr_info): Likewise.
* tree-ssa.c (walk_use_def_chains, check_phi_redundancy): Likewise.
* tree-ssa-ccp.c (dump_lattice_value, get_default_value, get_value,
set_lattice_value, likely_value, ccp_visit_phi_node, visit_assignment,
widen_bitfield, ccp_fold_builtin): Likewise.
* tree-ssa-copy.c (may_propagate_copy, merge_alias_info,
replace_exp_1, propagate_tree_value): Likewise.
* tree-ssa-copyrename.c (copy_rename_partition_coalesce): Likewise.
* tree-ssa-dce.c (set_control_dependence_map_bit,
find_control_dependence, find_pdom, mark_operand_necessary,
mark_stmt_if_obviously_necessary,
mark_control_dependent_edges_necessary, remove_dead_stmt): Likewise.
* tree-ssa-dom.c (dom_opt_initialize_block_local_data,
simplify_switch_and_lookup_avail_expr, cprop_into_successor_phis,
eliminate_redundant_computations, avail_expr_eq): Likewise.
* tree-ssa-dse.c (fix_stmt_v_may_defs): Likewise.
* tree-ssa-loop-ch.c (should_duplicate_loop_header_p,
duplicate_blocks): Likewise.
* tree-ssa-loop-im.c (for_each_index, set_level,
is_call_clobbered_ref): Likewise.
* tree-ssa-loop-ivopts.c (dump_use, divide, stmt_after_ip_normal_pos,
stmt_after_increment, set_iv, contains_abnormal_ssa_name_p,
find_interesting_uses_outer_or_nonlin, add_derived_ivs_candidates,
peel_address, ptr_difference_cost, may_replace_final_value,
determine_use_iv_cost, rewrite_use_nonlinear_expr, rewrite_use_outer,
rewrite_use, rewrite_uses): Likewise.
* tree-ssa-loop-manip.c (rewrite_into_loop_closed_ssa,
check_loop_closed_ssa_use): Likewise.
* tree-ssanames.c (make_ssa_name): Likewise.
* tree-ssa-operands.c (finalize_ssa_defs, finalize_ssa_uses,
finalize_ssa_v_must_defs, finalize_ssa_stmt_operands,
get_stmt_operands, get_expr_operands, get_asm_expr_operands,
get_indirect_ref_operands, add_stmt_operand): Likewise.
* tree-ssa-pre.c (value_exists_in_set_bitmap,
value_remove_from_set_bitmap, bitmap_insert_into_set, insert_into_set,
phi_translate, valid_in_set, compute_antic,
find_or_generate_expression, create_expression_by_pieces, insert_aux,
create_value_expr_from, eliminate): Likewise.
* tree-ssa-propagate.c (cfg_blocks_get): Likewise.
* tree-ssa-threadupdate.c (remove_last_stmt_and_useless_edges):
Likewise.
* tree-tailcall.c (independent_of_stmt_p, adjust_return_value,
eliminate_tail_call): Likewise.
* tree-vectorizer.c (vect_create_index_for_array_ref,
vect_align_data_ref, vect_create_data_ref,
vect_create_destination_var, vect_get_vec_def_for_operand,
vect_finish_stmt_generation, vect_transform_stmt,
vect_transform_loop_bound, vect_transform_loop,
vect_analyze_operations): Likewise.
* tree-vn.c (vn_compute, set_value_handle, get_value_handle):
Likewise.
* tree-flow-inline.h (var_ann, get_var_ann, get_def_from_ptr,
get_use_op_ptr, immediate_use, phi_ssa_name_p, bsi_start,
bsi_after_labels, bsi_last): Likewise.
* tree-ssa-live.c (var_union, change_partition_var,
create_ssa_var_map, calculate_live_on_entry, root_var_init,
type_var_init, add_coalesce, sort_coalesce_list, pop_best_coalesce):
Likewise.
* tree-ssa-live.h (partition_is_global, live_entry_blocks,
tpa_find_tree): Likewise.
(register_ssa_partition_check): Declare.
(register_ssa_partition): use it.
* tree-ssa-live.c: Include errors.h.
(register_ssa_partition_check): New.
* tree-ssa-operands.c: Include errors.h.
* Makefile.in (tree-ssa-operands.o): Depend on errors.h.
Co-Authored-By: Nathan Sidwell <nathan@codesourcery.com>
From-SVN: r87223
2004-09-09 09:54:12 +02:00
|
|
|
|
gcc_assert (num >= 0);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gcc_assert (gimple_code (t) != GIMPLE_RESX);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2005-12-18 02:19:20 +01:00
|
|
|
|
n = GGC_NEW (struct throw_stmt_node);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
n->stmt = t;
|
|
|
|
|
n->region_nr = num;
|
|
|
|
|
|
2005-05-12 21:29:21 +02:00
|
|
|
|
if (!get_eh_throw_stmt_table (ifun))
|
|
|
|
|
set_eh_throw_stmt_table (ifun, htab_create_ggc (31, struct_ptr_hash,
|
|
|
|
|
struct_ptr_eq,
|
|
|
|
|
ggc_free));
|
|
|
|
|
|
2005-05-11 18:25:30 +02:00
|
|
|
|
slot = htab_find_slot (get_eh_throw_stmt_table (ifun), n, INSERT);
|
targhooks.c (default_unwind_emit, [...]): Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* targhooks.c (default_unwind_emit, default_scalar_mode_supported_p):
Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* timevar.c (timevar_push, timevar_pop, timevar_start,
timevar_stop): Likewise.
* toplev.c (default_pch_valid_p): Likewise.
* tracer.c (tail_duplicate): Likewise.
* tree-alias-common.c (get_alias_var_decl,
get_values_from_constructor, create_alias_var, delete_alias_vars,
empty_points_to_set, same_points_to_set, ptr_may_alias_var):
Likewise.
* tree.c (tree_size, make_node_stat, copy_node_stat,
build_int_cst_wide, integer_all_onesp, list_length, chainon,
tree_node_structure, type_contains_placeholder_p, substitute_in_expr,
substitute_placeholder_in_expr, tabilize_reference_1, build0_stat,
build1_stat, build2_stat, build3_stat, build4_stat, is_attribute_p,
lookup_attribute, type_hash_canon, host_integerp, iterative_hash_expr,
build_method_type_directly, decl_type_context, get_callee_fndecl,
get_set_constructor_bits, build_vector_type_for_mode, int_cst_value,
tree_fold_gcd): Likewise.
* tree-cfg.c (create_bb, make_ctrl_stmt_edges, make_exit_edges,
make_cond_expr_edges, group_case_labels, tree_merge_blocks,
cleanup_control_expr_graph, find_taken_edge,
find_taken_edge_switch_expr, phi_alternatives_equal,
is_ctrl_altering_stmt, disband_implicit_edges, set_bb_for_stmt,
stmt_for_bsi, tree_find_edge_insert_loc, bsi_insert_on_edge_immediate,
tree_split_edge, tree_verify_flow_info, thread_jumps,
tree_redirect_edge_and_branch, tree_flow_call_edges_add): Likewise.
* tree-chrec.c (chrec_fold_poly_cst, chrec_fold_plus_poly_poly,
chrec_fold_multiply_poly_poly): Likewise.
* tree-complex.c (extract_component, expand_complex_division,
expand_complex_comparison, expand_complex_operations_1,
build_replicated_const, expand_vector_operations_1): Likewise.
* tree-data-ref.c (tree_fold_bezout, build_classic_dist_vector,
build_classic_dir_vector): Likewise.
* tree-dfa.c (compute_immediate_uses_for_phi,
compute_immediate_uses_for_stmt, create_var_ann, create_stmt_ann,
create_tree_ann, collect_dfa_stats, get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-eh.c (record_stmt_eh_region, add_stmt_to_eh_region,
record_in_finally_tree, replace_goto_queue_1,
maybe_record_in_goto_queue, verify_norecord_switch_expr,
do_return_redirection): Likewise.
* tree-if-conv.c (tree_if_convert_stmt, tree_if_convert_cond_expr,
add_to_dst_predicate_list, find_phi_replacement_condition,
replace_phi_with_cond_modify_expr, get_loop_body_in_if_conv_order):
Likewise.
* tree-inline.c (remap_decl, remap_type, remap_decls, copy_body_r,
initialize_inlined_parameters, declare_return_variable,
estimate_num_insns_1, expand_call_inline, expand_calls_inline,
optimize_inline_calls, copy_tree_r): Likewise.
* tree-into-ssa.c (rewrite_initialize_block_local_data, rewrite_stmt,
ssa_rewrite_stmt, rewrite_into_ssa): Likewise.
* tree-iterator.c (alloc_stmt_list, tsi_link_before, tsi_link_after,
tsi_split_statement_list_after, tsi_split_statement_list_before):
Likewise.
* tree-mudflap.c (mf_varname_tree): Likewise.
* tree-nested.c (create_tmp_var_for, lookup_field_for_decl,
lookup_tramp_for_decl, convert_all_function_calls): Likewise.
* tree-optimize.c (tree_rest_of_compilation): Likewise.
* tree-outof-ssa.c (create_temp, eliminate_build, eliminate_phi,
coalesce_abnormal_edges, coalesce_ssa_name, eliminate_virtual_phis,
free_temp_expr_table, add_dependance, finish_expr, rewrite_trees):
Likewise.
* tree-phinodes.c (resize_phi_node, add_phi_arg,
remove_all_phi_nodes_for): Likewise.
* tree-pretty-print.c (op_prio, print_call_name): Likewise.
* tree-profile.c (tree_gen_interval_profiler, tree_gen_pow2_profiler,
tree_gen_one_value_profiler, tree_gen_const_delta_profiler): Likewise.
* tree-sra.c (type_can_instantiate_all_elements, sra_hash_tree,
sra_elt_eq, sra_walk_expr, instantiate_missing_elements,
generate_one_element_ref, generate_element_copy,
generate_element_zero, scalarize_copy, scalarize_init,
scalarize_ldst): Likewise.
* tree-ssa-alias.c (delete_alias_info, group_aliases, may_alias_p,
add_may_alias, add_pointed_to_expr, add_pointed_to_var,
collect_points_to_info_r, get_tmt_for, get_ptr_info): Likewise.
* tree-ssa.c (walk_use_def_chains, check_phi_redundancy): Likewise.
* tree-ssa-ccp.c (dump_lattice_value, get_default_value, get_value,
set_lattice_value, likely_value, ccp_visit_phi_node, visit_assignment,
widen_bitfield, ccp_fold_builtin): Likewise.
* tree-ssa-copy.c (may_propagate_copy, merge_alias_info,
replace_exp_1, propagate_tree_value): Likewise.
* tree-ssa-copyrename.c (copy_rename_partition_coalesce): Likewise.
* tree-ssa-dce.c (set_control_dependence_map_bit,
find_control_dependence, find_pdom, mark_operand_necessary,
mark_stmt_if_obviously_necessary,
mark_control_dependent_edges_necessary, remove_dead_stmt): Likewise.
* tree-ssa-dom.c (dom_opt_initialize_block_local_data,
simplify_switch_and_lookup_avail_expr, cprop_into_successor_phis,
eliminate_redundant_computations, avail_expr_eq): Likewise.
* tree-ssa-dse.c (fix_stmt_v_may_defs): Likewise.
* tree-ssa-loop-ch.c (should_duplicate_loop_header_p,
duplicate_blocks): Likewise.
* tree-ssa-loop-im.c (for_each_index, set_level,
is_call_clobbered_ref): Likewise.
* tree-ssa-loop-ivopts.c (dump_use, divide, stmt_after_ip_normal_pos,
stmt_after_increment, set_iv, contains_abnormal_ssa_name_p,
find_interesting_uses_outer_or_nonlin, add_derived_ivs_candidates,
peel_address, ptr_difference_cost, may_replace_final_value,
determine_use_iv_cost, rewrite_use_nonlinear_expr, rewrite_use_outer,
rewrite_use, rewrite_uses): Likewise.
* tree-ssa-loop-manip.c (rewrite_into_loop_closed_ssa,
check_loop_closed_ssa_use): Likewise.
* tree-ssanames.c (make_ssa_name): Likewise.
* tree-ssa-operands.c (finalize_ssa_defs, finalize_ssa_uses,
finalize_ssa_v_must_defs, finalize_ssa_stmt_operands,
get_stmt_operands, get_expr_operands, get_asm_expr_operands,
get_indirect_ref_operands, add_stmt_operand): Likewise.
* tree-ssa-pre.c (value_exists_in_set_bitmap,
value_remove_from_set_bitmap, bitmap_insert_into_set, insert_into_set,
phi_translate, valid_in_set, compute_antic,
find_or_generate_expression, create_expression_by_pieces, insert_aux,
create_value_expr_from, eliminate): Likewise.
* tree-ssa-propagate.c (cfg_blocks_get): Likewise.
* tree-ssa-threadupdate.c (remove_last_stmt_and_useless_edges):
Likewise.
* tree-tailcall.c (independent_of_stmt_p, adjust_return_value,
eliminate_tail_call): Likewise.
* tree-vectorizer.c (vect_create_index_for_array_ref,
vect_align_data_ref, vect_create_data_ref,
vect_create_destination_var, vect_get_vec_def_for_operand,
vect_finish_stmt_generation, vect_transform_stmt,
vect_transform_loop_bound, vect_transform_loop,
vect_analyze_operations): Likewise.
* tree-vn.c (vn_compute, set_value_handle, get_value_handle):
Likewise.
* tree-flow-inline.h (var_ann, get_var_ann, get_def_from_ptr,
get_use_op_ptr, immediate_use, phi_ssa_name_p, bsi_start,
bsi_after_labels, bsi_last): Likewise.
* tree-ssa-live.c (var_union, change_partition_var,
create_ssa_var_map, calculate_live_on_entry, root_var_init,
type_var_init, add_coalesce, sort_coalesce_list, pop_best_coalesce):
Likewise.
* tree-ssa-live.h (partition_is_global, live_entry_blocks,
tpa_find_tree): Likewise.
(register_ssa_partition_check): Declare.
(register_ssa_partition): use it.
* tree-ssa-live.c: Include errors.h.
(register_ssa_partition_check): New.
* tree-ssa-operands.c: Include errors.h.
* Makefile.in (tree-ssa-operands.o): Depend on errors.h.
Co-Authored-By: Nathan Sidwell <nathan@codesourcery.com>
From-SVN: r87223
2004-09-09 09:54:12 +02:00
|
|
|
|
gcc_assert (!*slot);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
*slot = n;
|
|
|
|
|
}
|
2004-06-29 08:59:35 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Add statement T in the current function (cfun) to EH region number
|
|
|
|
|
NUM. */
|
|
|
|
|
|
2005-05-11 18:25:30 +02:00
|
|
|
|
void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
add_stmt_to_eh_region (gimple t, int num)
|
2005-05-11 18:25:30 +02:00
|
|
|
|
{
|
|
|
|
|
add_stmt_to_eh_region_fn (cfun, t, num);
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Remove statement T in function IFUN from the EH region holding it. */
|
|
|
|
|
|
2004-06-29 08:59:35 +02:00
|
|
|
|
bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
remove_stmt_from_eh_region_fn (struct function *ifun, gimple t)
|
2004-06-29 08:59:35 +02:00
|
|
|
|
{
|
|
|
|
|
struct throw_stmt_node dummy;
|
|
|
|
|
void **slot;
|
|
|
|
|
|
2005-05-11 18:25:30 +02:00
|
|
|
|
if (!get_eh_throw_stmt_table (ifun))
|
2004-06-29 08:59:35 +02:00
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
dummy.stmt = t;
|
2005-05-11 18:25:30 +02:00
|
|
|
|
slot = htab_find_slot (get_eh_throw_stmt_table (ifun), &dummy,
|
|
|
|
|
NO_INSERT);
|
2004-06-29 08:59:35 +02:00
|
|
|
|
if (slot)
|
|
|
|
|
{
|
2005-05-11 18:25:30 +02:00
|
|
|
|
htab_clear_slot (get_eh_throw_stmt_table (ifun), slot);
|
2004-06-29 08:59:35 +02:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Remove statement T in the current function (cfun) from the EH
|
|
|
|
|
region holding it. */
|
|
|
|
|
|
2005-05-11 18:25:30 +02:00
|
|
|
|
bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
remove_stmt_from_eh_region (gimple t)
|
2005-05-11 18:25:30 +02:00
|
|
|
|
{
|
|
|
|
|
return remove_stmt_from_eh_region_fn (cfun, t);
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Determine if statement T is inside an EH region in function IFUN.
|
|
|
|
|
Return the EH region number if found, return -2 if IFUN does not
|
|
|
|
|
have an EH table and -1 if T could not be found in IFUN's EH region
|
|
|
|
|
table. */
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
int
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lookup_stmt_eh_region_fn (struct function *ifun, gimple t)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct throw_stmt_node *p, n;
|
|
|
|
|
|
2005-05-11 18:25:30 +02:00
|
|
|
|
if (!get_eh_throw_stmt_table (ifun))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return -2;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
n.stmt = t;
|
|
|
|
|
p = (struct throw_stmt_node *) htab_find (get_eh_throw_stmt_table (ifun), &n);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return (p ? p->region_nr : -1);
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Determine if statement T is inside an EH region in the current
|
|
|
|
|
function (cfun). Return the EH region number if found, return -2
|
|
|
|
|
if cfun does not have an EH table and -1 if T could not be found in
|
|
|
|
|
cfun's EH region table. */
|
|
|
|
|
|
2005-05-11 18:25:30 +02:00
|
|
|
|
int
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lookup_stmt_eh_region (gimple t)
|
2005-05-11 18:25:30 +02:00
|
|
|
|
{
|
|
|
|
|
/* We can get called from initialized data when -fnon-call-exceptions
|
|
|
|
|
is on; prevent crash. */
|
|
|
|
|
if (!cfun)
|
|
|
|
|
return -1;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2005-05-11 18:25:30 +02:00
|
|
|
|
return lookup_stmt_eh_region_fn (cfun, t);
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Determine if expression T is inside an EH region in the current
|
|
|
|
|
function (cfun). Return the EH region number if found, return -2
|
|
|
|
|
if IFUN does not have an EH table and -1 if T could not be found in
|
|
|
|
|
IFUN's EH region table. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
lookup_expr_eh_region (tree t)
|
|
|
|
|
{
|
|
|
|
|
/* We can get called from initialized data when -fnon-call-exceptions
|
|
|
|
|
is on; prevent crash. */
|
|
|
|
|
if (!cfun)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (!get_eh_throw_stmt_table (cfun))
|
|
|
|
|
return -2;
|
|
|
|
|
|
|
|
|
|
if (t && EXPR_P (t))
|
|
|
|
|
{
|
|
|
|
|
tree_ann_common_t ann = tree_common_ann (t);
|
|
|
|
|
if (ann)
|
|
|
|
|
return (int) ann->rn;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* First pass of EH node decomposition. Build up a tree of GIMPLE_TRY_FINALLY
|
2004-05-13 08:41:07 +02:00
|
|
|
|
nodes and LABEL_DECL nodes. We will use this during the second phase to
|
|
|
|
|
determine if a goto leaves the body of a TRY_FINALLY_EXPR node. */
|
|
|
|
|
|
|
|
|
|
struct finally_tree_node
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* When storing a GIMPLE_TRY, we have to record a gimple. However
|
|
|
|
|
when deciding whether a GOTO to a certain LABEL_DECL (which is a
|
|
|
|
|
tree) leaves the TRY block, its necessary to record a tree in
|
|
|
|
|
this field. Thus a treemple is used. */
|
|
|
|
|
treemple child;
|
|
|
|
|
gimple parent;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Note that this table is *not* marked GTY. It is short-lived. */
|
|
|
|
|
static htab_t finally_tree;
|
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
record_in_finally_tree (treemple child, gimple parent)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct finally_tree_node *n;
|
|
|
|
|
void **slot;
|
|
|
|
|
|
2005-12-18 02:19:20 +01:00
|
|
|
|
n = XNEW (struct finally_tree_node);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
n->child = child;
|
|
|
|
|
n->parent = parent;
|
|
|
|
|
|
|
|
|
|
slot = htab_find_slot (finally_tree, n, INSERT);
|
targhooks.c (default_unwind_emit, [...]): Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* targhooks.c (default_unwind_emit, default_scalar_mode_supported_p):
Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* timevar.c (timevar_push, timevar_pop, timevar_start,
timevar_stop): Likewise.
* toplev.c (default_pch_valid_p): Likewise.
* tracer.c (tail_duplicate): Likewise.
* tree-alias-common.c (get_alias_var_decl,
get_values_from_constructor, create_alias_var, delete_alias_vars,
empty_points_to_set, same_points_to_set, ptr_may_alias_var):
Likewise.
* tree.c (tree_size, make_node_stat, copy_node_stat,
build_int_cst_wide, integer_all_onesp, list_length, chainon,
tree_node_structure, type_contains_placeholder_p, substitute_in_expr,
substitute_placeholder_in_expr, tabilize_reference_1, build0_stat,
build1_stat, build2_stat, build3_stat, build4_stat, is_attribute_p,
lookup_attribute, type_hash_canon, host_integerp, iterative_hash_expr,
build_method_type_directly, decl_type_context, get_callee_fndecl,
get_set_constructor_bits, build_vector_type_for_mode, int_cst_value,
tree_fold_gcd): Likewise.
* tree-cfg.c (create_bb, make_ctrl_stmt_edges, make_exit_edges,
make_cond_expr_edges, group_case_labels, tree_merge_blocks,
cleanup_control_expr_graph, find_taken_edge,
find_taken_edge_switch_expr, phi_alternatives_equal,
is_ctrl_altering_stmt, disband_implicit_edges, set_bb_for_stmt,
stmt_for_bsi, tree_find_edge_insert_loc, bsi_insert_on_edge_immediate,
tree_split_edge, tree_verify_flow_info, thread_jumps,
tree_redirect_edge_and_branch, tree_flow_call_edges_add): Likewise.
* tree-chrec.c (chrec_fold_poly_cst, chrec_fold_plus_poly_poly,
chrec_fold_multiply_poly_poly): Likewise.
* tree-complex.c (extract_component, expand_complex_division,
expand_complex_comparison, expand_complex_operations_1,
build_replicated_const, expand_vector_operations_1): Likewise.
* tree-data-ref.c (tree_fold_bezout, build_classic_dist_vector,
build_classic_dir_vector): Likewise.
* tree-dfa.c (compute_immediate_uses_for_phi,
compute_immediate_uses_for_stmt, create_var_ann, create_stmt_ann,
create_tree_ann, collect_dfa_stats, get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-eh.c (record_stmt_eh_region, add_stmt_to_eh_region,
record_in_finally_tree, replace_goto_queue_1,
maybe_record_in_goto_queue, verify_norecord_switch_expr,
do_return_redirection): Likewise.
* tree-if-conv.c (tree_if_convert_stmt, tree_if_convert_cond_expr,
add_to_dst_predicate_list, find_phi_replacement_condition,
replace_phi_with_cond_modify_expr, get_loop_body_in_if_conv_order):
Likewise.
* tree-inline.c (remap_decl, remap_type, remap_decls, copy_body_r,
initialize_inlined_parameters, declare_return_variable,
estimate_num_insns_1, expand_call_inline, expand_calls_inline,
optimize_inline_calls, copy_tree_r): Likewise.
* tree-into-ssa.c (rewrite_initialize_block_local_data, rewrite_stmt,
ssa_rewrite_stmt, rewrite_into_ssa): Likewise.
* tree-iterator.c (alloc_stmt_list, tsi_link_before, tsi_link_after,
tsi_split_statement_list_after, tsi_split_statement_list_before):
Likewise.
* tree-mudflap.c (mf_varname_tree): Likewise.
* tree-nested.c (create_tmp_var_for, lookup_field_for_decl,
lookup_tramp_for_decl, convert_all_function_calls): Likewise.
* tree-optimize.c (tree_rest_of_compilation): Likewise.
* tree-outof-ssa.c (create_temp, eliminate_build, eliminate_phi,
coalesce_abnormal_edges, coalesce_ssa_name, eliminate_virtual_phis,
free_temp_expr_table, add_dependance, finish_expr, rewrite_trees):
Likewise.
* tree-phinodes.c (resize_phi_node, add_phi_arg,
remove_all_phi_nodes_for): Likewise.
* tree-pretty-print.c (op_prio, print_call_name): Likewise.
* tree-profile.c (tree_gen_interval_profiler, tree_gen_pow2_profiler,
tree_gen_one_value_profiler, tree_gen_const_delta_profiler): Likewise.
* tree-sra.c (type_can_instantiate_all_elements, sra_hash_tree,
sra_elt_eq, sra_walk_expr, instantiate_missing_elements,
generate_one_element_ref, generate_element_copy,
generate_element_zero, scalarize_copy, scalarize_init,
scalarize_ldst): Likewise.
* tree-ssa-alias.c (delete_alias_info, group_aliases, may_alias_p,
add_may_alias, add_pointed_to_expr, add_pointed_to_var,
collect_points_to_info_r, get_tmt_for, get_ptr_info): Likewise.
* tree-ssa.c (walk_use_def_chains, check_phi_redundancy): Likewise.
* tree-ssa-ccp.c (dump_lattice_value, get_default_value, get_value,
set_lattice_value, likely_value, ccp_visit_phi_node, visit_assignment,
widen_bitfield, ccp_fold_builtin): Likewise.
* tree-ssa-copy.c (may_propagate_copy, merge_alias_info,
replace_exp_1, propagate_tree_value): Likewise.
* tree-ssa-copyrename.c (copy_rename_partition_coalesce): Likewise.
* tree-ssa-dce.c (set_control_dependence_map_bit,
find_control_dependence, find_pdom, mark_operand_necessary,
mark_stmt_if_obviously_necessary,
mark_control_dependent_edges_necessary, remove_dead_stmt): Likewise.
* tree-ssa-dom.c (dom_opt_initialize_block_local_data,
simplify_switch_and_lookup_avail_expr, cprop_into_successor_phis,
eliminate_redundant_computations, avail_expr_eq): Likewise.
* tree-ssa-dse.c (fix_stmt_v_may_defs): Likewise.
* tree-ssa-loop-ch.c (should_duplicate_loop_header_p,
duplicate_blocks): Likewise.
* tree-ssa-loop-im.c (for_each_index, set_level,
is_call_clobbered_ref): Likewise.
* tree-ssa-loop-ivopts.c (dump_use, divide, stmt_after_ip_normal_pos,
stmt_after_increment, set_iv, contains_abnormal_ssa_name_p,
find_interesting_uses_outer_or_nonlin, add_derived_ivs_candidates,
peel_address, ptr_difference_cost, may_replace_final_value,
determine_use_iv_cost, rewrite_use_nonlinear_expr, rewrite_use_outer,
rewrite_use, rewrite_uses): Likewise.
* tree-ssa-loop-manip.c (rewrite_into_loop_closed_ssa,
check_loop_closed_ssa_use): Likewise.
* tree-ssanames.c (make_ssa_name): Likewise.
* tree-ssa-operands.c (finalize_ssa_defs, finalize_ssa_uses,
finalize_ssa_v_must_defs, finalize_ssa_stmt_operands,
get_stmt_operands, get_expr_operands, get_asm_expr_operands,
get_indirect_ref_operands, add_stmt_operand): Likewise.
* tree-ssa-pre.c (value_exists_in_set_bitmap,
value_remove_from_set_bitmap, bitmap_insert_into_set, insert_into_set,
phi_translate, valid_in_set, compute_antic,
find_or_generate_expression, create_expression_by_pieces, insert_aux,
create_value_expr_from, eliminate): Likewise.
* tree-ssa-propagate.c (cfg_blocks_get): Likewise.
* tree-ssa-threadupdate.c (remove_last_stmt_and_useless_edges):
Likewise.
* tree-tailcall.c (independent_of_stmt_p, adjust_return_value,
eliminate_tail_call): Likewise.
* tree-vectorizer.c (vect_create_index_for_array_ref,
vect_align_data_ref, vect_create_data_ref,
vect_create_destination_var, vect_get_vec_def_for_operand,
vect_finish_stmt_generation, vect_transform_stmt,
vect_transform_loop_bound, vect_transform_loop,
vect_analyze_operations): Likewise.
* tree-vn.c (vn_compute, set_value_handle, get_value_handle):
Likewise.
* tree-flow-inline.h (var_ann, get_var_ann, get_def_from_ptr,
get_use_op_ptr, immediate_use, phi_ssa_name_p, bsi_start,
bsi_after_labels, bsi_last): Likewise.
* tree-ssa-live.c (var_union, change_partition_var,
create_ssa_var_map, calculate_live_on_entry, root_var_init,
type_var_init, add_coalesce, sort_coalesce_list, pop_best_coalesce):
Likewise.
* tree-ssa-live.h (partition_is_global, live_entry_blocks,
tpa_find_tree): Likewise.
(register_ssa_partition_check): Declare.
(register_ssa_partition): use it.
* tree-ssa-live.c: Include errors.h.
(register_ssa_partition_check): New.
* tree-ssa-operands.c: Include errors.h.
* Makefile.in (tree-ssa-operands.o): Depend on errors.h.
Co-Authored-By: Nathan Sidwell <nathan@codesourcery.com>
From-SVN: r87223
2004-09-09 09:54:12 +02:00
|
|
|
|
gcc_assert (!*slot);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
*slot = n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
collect_finally_tree (gimple stmt, gimple region);
|
|
|
|
|
|
|
|
|
|
/* Go through the gimple sequence. Works with collect_finally_tree to
|
|
|
|
|
record all GIMPLE_LABEL and GIMPLE_TRY statements. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
collect_finally_tree_1 (gimple_seq seq, gimple region)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_stmt_iterator gsi;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
for (gsi = gsi_start (seq); !gsi_end_p (gsi); gsi_next (&gsi))
|
|
|
|
|
collect_finally_tree (gsi_stmt (gsi), region);
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static void
|
|
|
|
|
collect_finally_tree (gimple stmt, gimple region)
|
|
|
|
|
{
|
|
|
|
|
treemple temp;
|
|
|
|
|
|
|
|
|
|
switch (gimple_code (stmt))
|
|
|
|
|
{
|
|
|
|
|
case GIMPLE_LABEL:
|
|
|
|
|
temp.t = gimple_label_label (stmt);
|
|
|
|
|
record_in_finally_tree (temp, region);
|
|
|
|
|
break;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_TRY:
|
|
|
|
|
if (gimple_try_kind (stmt) == GIMPLE_TRY_FINALLY)
|
|
|
|
|
{
|
|
|
|
|
temp.g = stmt;
|
|
|
|
|
record_in_finally_tree (temp, region);
|
|
|
|
|
collect_finally_tree_1 (gimple_try_eval (stmt), stmt);
|
|
|
|
|
collect_finally_tree_1 (gimple_try_cleanup (stmt), region);
|
|
|
|
|
}
|
|
|
|
|
else if (gimple_try_kind (stmt) == GIMPLE_TRY_CATCH)
|
|
|
|
|
{
|
|
|
|
|
collect_finally_tree_1 (gimple_try_eval (stmt), region);
|
|
|
|
|
collect_finally_tree_1 (gimple_try_cleanup (stmt), region);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_CATCH:
|
|
|
|
|
collect_finally_tree_1 (gimple_catch_handler (stmt), region);
|
|
|
|
|
break;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_EH_FILTER:
|
|
|
|
|
collect_finally_tree_1 (gimple_eh_filter_failure (stmt), region);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
/* A type, a decl, or some kind of statement that we're not
|
|
|
|
|
interested in. Don't walk them. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* Use the finally tree to determine if a jump from START to TARGET
|
|
|
|
|
would leave the try_finally node that START lives in. */
|
|
|
|
|
|
|
|
|
|
static bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
outside_finally_tree (treemple start, gimple target)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct finally_tree_node n, *p;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
n.child = start;
|
2005-12-18 02:19:20 +01:00
|
|
|
|
p = (struct finally_tree_node *) htab_find (finally_tree, &n);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (!p)
|
|
|
|
|
return true;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
start.g = p->parent;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
while (start.g != target);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Second pass of EH node decomposition. Actually transform the GIMPLE_TRY
|
|
|
|
|
nodes into a set of gotos, magic labels, and eh regions.
|
2004-05-13 08:41:07 +02:00
|
|
|
|
The eh region creation is straight-forward, but frobbing all the gotos
|
|
|
|
|
and such into shape isn't. */
|
|
|
|
|
|
|
|
|
|
/* State of the world while lowering. */
|
|
|
|
|
|
|
|
|
|
struct leh_state
|
|
|
|
|
{
|
2004-08-19 23:34:37 +02:00
|
|
|
|
/* What's "current" while constructing the eh region tree. These
|
2004-05-13 08:41:07 +02:00
|
|
|
|
correspond to variables of the same name in cfun->eh, which we
|
|
|
|
|
don't have easy access to. */
|
|
|
|
|
struct eh_region *cur_region;
|
|
|
|
|
struct eh_region *prev_try;
|
|
|
|
|
|
|
|
|
|
/* Processing of TRY_FINALLY requires a bit more state. This is
|
|
|
|
|
split out into a separate structure so that we don't have to
|
|
|
|
|
copy so much when processing other nodes. */
|
|
|
|
|
struct leh_tf_state *tf;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct leh_tf_state
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Pointer to the GIMPLE_TRY_FINALLY node under discussion. The
|
|
|
|
|
try_finally_expr is the original GIMPLE_TRY_FINALLY. We need to retain
|
|
|
|
|
this so that outside_finally_tree can reliably reference the tree used
|
|
|
|
|
in the collect_finally_tree data structures. */
|
|
|
|
|
gimple try_finally_expr;
|
|
|
|
|
gimple top_p;
|
|
|
|
|
/* While lowering a top_p usually it is expanded into multiple statements,
|
|
|
|
|
thus we need the following field to store them. */
|
|
|
|
|
gimple_seq top_p_seq;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* The state outside this try_finally node. */
|
|
|
|
|
struct leh_state *outer;
|
|
|
|
|
|
|
|
|
|
/* The exception region created for it. */
|
|
|
|
|
struct eh_region *region;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* The GOTO_QUEUE is is an array of GIMPLE_GOTO and GIMPLE_RETURN statements
|
|
|
|
|
that are seen to escape this GIMPLE_TRY_FINALLY node.
|
|
|
|
|
The idea is to record a gimple statement for everything except for
|
|
|
|
|
the conditionals, which get their labels recorded. Since labels are of
|
|
|
|
|
type 'tree', we need this node to store both gimple and tree objects.
|
|
|
|
|
REPL_STMT is the sequence used to replace the goto/return statement.
|
|
|
|
|
CONT_STMT is used to store the statement that allows the return/goto to
|
|
|
|
|
jump to the original destination. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
struct goto_queue_node {
|
2008-07-28 16:33:56 +02:00
|
|
|
|
treemple stmt;
|
|
|
|
|
gimple_seq repl_stmt;
|
|
|
|
|
gimple cont_stmt;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
int index;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* this is used when index >= 0 to indicate that stmt is a label(as
|
|
|
|
|
opposed to a goto stmt) */
|
|
|
|
|
int is_label;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
} *goto_queue;
|
|
|
|
|
size_t goto_queue_size;
|
|
|
|
|
size_t goto_queue_active;
|
|
|
|
|
|
2008-06-06 07:42:00 +02:00
|
|
|
|
/* Pointer map to help in searching goto_queue when it is large. */
|
2007-08-14 20:12:34 +02:00
|
|
|
|
struct pointer_map_t *goto_queue_map;
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* The set of unique labels seen as entries in the goto queue. */
|
2005-05-14 05:25:44 +02:00
|
|
|
|
VEC(tree,heap) *dest_array;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* A label to be added at the end of the completed transformed
|
|
|
|
|
sequence. It will be set if may_fallthru was true *at one time*,
|
|
|
|
|
though subsequent transformations may have cleared that flag. */
|
|
|
|
|
tree fallthru_label;
|
|
|
|
|
|
2004-08-19 23:34:37 +02:00
|
|
|
|
/* A label that has been registered with except.c to be the
|
2004-05-13 08:41:07 +02:00
|
|
|
|
landing pad for this try block. */
|
|
|
|
|
tree eh_label;
|
|
|
|
|
|
|
|
|
|
/* True if it is possible to fall out the bottom of the try block.
|
|
|
|
|
Cleared if the fallthru is converted to a goto. */
|
|
|
|
|
bool may_fallthru;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* True if any entry in goto_queue is a GIMPLE_RETURN. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
bool may_return;
|
|
|
|
|
|
|
|
|
|
/* True if the finally block can receive an exception edge.
|
|
|
|
|
Cleared if the exception case is handled by code duplication. */
|
|
|
|
|
bool may_throw;
|
|
|
|
|
};
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static gimple_seq lower_eh_filter (struct leh_state *, gimple);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Search for STMT in the goto queue. Return the replacement,
|
|
|
|
|
or null if the statement isn't in the queue. */
|
|
|
|
|
|
2007-08-14 20:12:34 +02:00
|
|
|
|
#define LARGE_GOTO_QUEUE 20
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static void lower_eh_constructs_1 (struct leh_state *state, gimple_seq seq);
|
|
|
|
|
|
|
|
|
|
static gimple_seq
|
|
|
|
|
find_goto_replacement (struct leh_tf_state *tf, treemple stmt)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2007-08-14 20:12:34 +02:00
|
|
|
|
unsigned int i;
|
|
|
|
|
void **slot;
|
|
|
|
|
|
|
|
|
|
if (tf->goto_queue_active < LARGE_GOTO_QUEUE)
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; i < tf->goto_queue_active; i++)
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if ( tf->goto_queue[i].stmt.g == stmt.g)
|
2007-08-14 20:12:34 +02:00
|
|
|
|
return tf->goto_queue[i].repl_stmt;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we have a large number of entries in the goto_queue, create a
|
|
|
|
|
pointer map and use that for searching. */
|
|
|
|
|
|
|
|
|
|
if (!tf->goto_queue_map)
|
|
|
|
|
{
|
|
|
|
|
tf->goto_queue_map = pointer_map_create ();
|
|
|
|
|
for (i = 0; i < tf->goto_queue_active; i++)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
slot = pointer_map_insert (tf->goto_queue_map,
|
|
|
|
|
tf->goto_queue[i].stmt.g);
|
2007-08-14 20:12:34 +02:00
|
|
|
|
gcc_assert (*slot == NULL);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
*slot = &tf->goto_queue[i];
|
2007-08-14 20:12:34 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
slot = pointer_map_contains (tf->goto_queue_map, stmt.g);
|
2007-08-14 20:12:34 +02:00
|
|
|
|
if (slot != NULL)
|
|
|
|
|
return (((struct goto_queue_node *) *slot)->repl_stmt);
|
|
|
|
|
|
|
|
|
|
return NULL;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of replace_goto_queue_1. Handles the sub-clauses of a
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lowered GIMPLE_COND. If, by chance, the replacement is a simple goto,
|
2004-05-13 08:41:07 +02:00
|
|
|
|
then we can just splat it in, otherwise we add the new stmts immediately
|
2008-07-28 16:33:56 +02:00
|
|
|
|
after the GIMPLE_COND and redirect. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
replace_goto_queue_cond_clause (tree *tp, struct leh_tf_state *tf,
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_stmt_iterator *gsi)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree label;
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
gimple_seq new_seq;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
treemple temp;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
temp.tp = tp;
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
new_seq = find_goto_replacement (tf, temp);
|
|
|
|
|
if (!new_seq)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return;
|
|
|
|
|
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
if (gimple_seq_singleton_p (new_seq)
|
|
|
|
|
&& gimple_code (gimple_seq_first_stmt (new_seq)) == GIMPLE_GOTO)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
*tp = gimple_goto_dest (gimple_seq_first_stmt (new_seq));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
label = create_artificial_label ();
|
|
|
|
|
/* Set the new label for the GIMPLE_COND */
|
|
|
|
|
*tp = label;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi_insert_after (gsi, gimple_build_label (label), GSI_CONTINUE_LINKING);
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
gsi_insert_seq_after (gsi, gimple_seq_copy (new_seq), GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-08-19 23:34:37 +02:00
|
|
|
|
/* The real work of replace_goto_queue. Returns with TSI updated to
|
2004-05-13 08:41:07 +02:00
|
|
|
|
point to the next statement. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static void replace_goto_queue_stmt_list (gimple_seq, struct leh_tf_state *);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
replace_goto_queue_1 (gimple stmt, struct leh_tf_state *tf,
|
|
|
|
|
gimple_stmt_iterator *gsi)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq seq;
|
|
|
|
|
treemple temp;
|
|
|
|
|
temp.g = NULL;
|
|
|
|
|
|
|
|
|
|
switch (gimple_code (stmt))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_GOTO:
|
|
|
|
|
case GIMPLE_RETURN:
|
|
|
|
|
temp.g = stmt;
|
|
|
|
|
seq = find_goto_replacement (tf, temp);
|
|
|
|
|
if (seq)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi_insert_seq_before (gsi, gimple_seq_copy (seq), GSI_SAME_STMT);
|
|
|
|
|
gsi_remove (gsi, false);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_COND:
|
|
|
|
|
replace_goto_queue_cond_clause (gimple_op_ptr (stmt, 2), tf, gsi);
|
|
|
|
|
replace_goto_queue_cond_clause (gimple_op_ptr (stmt, 3), tf, gsi);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_TRY:
|
|
|
|
|
replace_goto_queue_stmt_list (gimple_try_eval (stmt), tf);
|
|
|
|
|
replace_goto_queue_stmt_list (gimple_try_cleanup (stmt), tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
break;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_CATCH:
|
|
|
|
|
replace_goto_queue_stmt_list (gimple_catch_handler (stmt), tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
break;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_EH_FILTER:
|
|
|
|
|
replace_goto_queue_stmt_list (gimple_eh_filter_failure (stmt), tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
/* These won't have gotos in them. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi_next (gsi);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* A subroutine of replace_goto_queue. Handles GIMPLE_SEQ. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
replace_goto_queue_stmt_list (gimple_seq seq, struct leh_tf_state *tf)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_stmt_iterator gsi = gsi_start (seq);
|
|
|
|
|
|
|
|
|
|
while (!gsi_end_p (gsi))
|
|
|
|
|
replace_goto_queue_1 (gsi_stmt (gsi), tf, &gsi);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Replace all goto queue members. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
replace_goto_queue (struct leh_tf_state *tf)
|
|
|
|
|
{
|
2005-01-04 13:45:42 +01:00
|
|
|
|
if (tf->goto_queue_active == 0)
|
|
|
|
|
return;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
replace_goto_queue_stmt_list (tf->top_p_seq, tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Add a new record to the goto queue contained in TF. NEW_STMT is the
|
|
|
|
|
data to be added, IS_LABEL indicates whether NEW_STMT is a label or
|
|
|
|
|
a gimple return. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
record_in_goto_queue (struct leh_tf_state *tf,
|
|
|
|
|
treemple new_stmt,
|
|
|
|
|
int index,
|
|
|
|
|
bool is_label)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
size_t active, size;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
struct goto_queue_node *q;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2007-08-14 20:12:34 +02:00
|
|
|
|
gcc_assert (!tf->goto_queue_map);
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
active = tf->goto_queue_active;
|
|
|
|
|
size = tf->goto_queue_size;
|
|
|
|
|
if (active >= size)
|
|
|
|
|
{
|
|
|
|
|
size = (size ? size * 2 : 32);
|
|
|
|
|
tf->goto_queue_size = size;
|
|
|
|
|
tf->goto_queue
|
2005-12-18 02:19:20 +01:00
|
|
|
|
= XRESIZEVEC (struct goto_queue_node, tf->goto_queue, size);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
q = &tf->goto_queue[active];
|
|
|
|
|
tf->goto_queue_active = active + 1;
|
2004-08-19 23:34:37 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
memset (q, 0, sizeof (*q));
|
2008-07-28 16:33:56 +02:00
|
|
|
|
q->stmt = new_stmt;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
q->index = index;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
q->is_label = is_label;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Record the LABEL label in the goto queue contained in TF.
|
|
|
|
|
TF is not null. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
record_in_goto_queue_label (struct leh_tf_state *tf, treemple stmt, tree label)
|
|
|
|
|
{
|
|
|
|
|
int index;
|
|
|
|
|
treemple temp, new_stmt;
|
|
|
|
|
|
|
|
|
|
if (!label)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Computed and non-local gotos do not get processed. Given
|
|
|
|
|
their nature we can neither tell whether we've escaped the
|
|
|
|
|
finally block nor redirect them if we knew. */
|
|
|
|
|
if (TREE_CODE (label) != LABEL_DECL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* No need to record gotos that don't leave the try block. */
|
|
|
|
|
temp.t = label;
|
|
|
|
|
if (!outside_finally_tree (temp, tf->try_finally_expr))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (! tf->dest_array)
|
|
|
|
|
{
|
|
|
|
|
tf->dest_array = VEC_alloc (tree, heap, 10);
|
|
|
|
|
VEC_quick_push (tree, tf->dest_array, label);
|
|
|
|
|
index = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int n = VEC_length (tree, tf->dest_array);
|
|
|
|
|
for (index = 0; index < n; ++index)
|
|
|
|
|
if (VEC_index (tree, tf->dest_array, index) == label)
|
|
|
|
|
break;
|
|
|
|
|
if (index == n)
|
|
|
|
|
VEC_safe_push (tree, heap, tf->dest_array, label);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* In the case of a GOTO we want to record the destination label,
|
|
|
|
|
since with a GIMPLE_COND we have an easy access to the then/else
|
|
|
|
|
labels. */
|
|
|
|
|
new_stmt = stmt;
|
|
|
|
|
record_in_goto_queue (tf, new_stmt, index, true);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* For any GIMPLE_GOTO or GIMPLE_RETURN, decide whether it leaves a try_finally
|
|
|
|
|
node, and if so record that fact in the goto queue associated with that
|
|
|
|
|
try_finally node. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
maybe_record_in_goto_queue (struct leh_state *state, gimple stmt)
|
|
|
|
|
{
|
|
|
|
|
struct leh_tf_state *tf = state->tf;
|
|
|
|
|
treemple new_stmt;
|
|
|
|
|
|
|
|
|
|
if (!tf)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
switch (gimple_code (stmt))
|
|
|
|
|
{
|
|
|
|
|
case GIMPLE_COND:
|
|
|
|
|
new_stmt.tp = gimple_op_ptr (stmt, 2);
|
|
|
|
|
record_in_goto_queue_label (tf, new_stmt, gimple_cond_true_label (stmt));
|
|
|
|
|
new_stmt.tp = gimple_op_ptr (stmt, 3);
|
|
|
|
|
record_in_goto_queue_label (tf, new_stmt, gimple_cond_false_label (stmt));
|
|
|
|
|
break;
|
|
|
|
|
case GIMPLE_GOTO:
|
|
|
|
|
new_stmt.g = stmt;
|
|
|
|
|
record_in_goto_queue_label (tf, new_stmt, gimple_goto_dest (stmt));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case GIMPLE_RETURN:
|
|
|
|
|
tf->may_return = true;
|
|
|
|
|
new_stmt.g = stmt;
|
|
|
|
|
record_in_goto_queue (tf, new_stmt, -1, false);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
gcc_unreachable ();
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
#ifdef ENABLE_CHECKING
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* We do not process GIMPLE_SWITCHes for now. As long as the original source
|
2004-05-13 08:41:07 +02:00
|
|
|
|
was in fact structured, and we've not yet done jump threading, then none
|
2008-07-28 16:33:56 +02:00
|
|
|
|
of the labels will leave outer GIMPLE_TRY_FINALLY nodes. Verify this. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
verify_norecord_switch_expr (struct leh_state *state, gimple switch_expr)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct leh_tf_state *tf = state->tf;
|
|
|
|
|
size_t i, n;
|
|
|
|
|
|
|
|
|
|
if (!tf)
|
|
|
|
|
return;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
n = gimple_switch_num_labels (switch_expr);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < n; ++i)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
treemple temp;
|
|
|
|
|
tree lab = CASE_LABEL (gimple_switch_label (switch_expr, i));
|
|
|
|
|
temp.t = lab;
|
|
|
|
|
gcc_assert (!outside_finally_tree (temp, tf->try_finally_expr));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
#define verify_norecord_switch_expr(state, switch_expr)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Redirect a RETURN_EXPR pointed to by STMT_P to FINLAB. Place in CONT_P
|
|
|
|
|
whatever is needed to finish the return. If MOD is non-null, insert it
|
|
|
|
|
before the new branch. RETURN_VALUE_P is a cache containing a temporary
|
bb-reorder.c, [...]: Fix comment formatting.
* bb-reorder.c, builtins.c, c-common.c, c-gimplify.c,
c-incpath.c, cgraphunit.c, ddg.c, defaults.h, dwarf2out.c,
expmed.c, flags.h, gcc.c, gensupport.c, gimplify.c, global.c,
passes.c, reg-stack.c, target.h, toplev.c, tree-alias-ander.c,
tree-alias-common.c, tree-cfg.c, tree-complex.c, tree-dfa.c,
tree-eh.c, tree-mudflap.c, tree-mudflap.h, tree-outof-ssa.c,
tree-phinodes.c, tree-pretty-print.c, tree-ssa-alias.c,
tree-ssa-ccp.c, tree-ssa-live.c, tree-ssa-live.h,
tree-ssa-pre.c, tree.h, value-prof.h, varasm.c: Fix comment
formatting.
From-SVN: r82463
2004-05-30 20:32:31 +02:00
|
|
|
|
variable to be used in manipulating the value returned from the function. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
do_return_redirection (struct goto_queue_node *q, tree finlab, gimple_seq mod,
|
2004-05-13 08:41:07 +02:00
|
|
|
|
tree *return_value_p)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree ret_expr;
|
|
|
|
|
gimple x;
|
|
|
|
|
|
|
|
|
|
/* In the case of a return, the queue node must be a gimple statement. */
|
|
|
|
|
gcc_assert (!q->is_label);
|
|
|
|
|
|
|
|
|
|
ret_expr = gimple_return_retval (q->stmt.g);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (ret_expr)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (!*return_value_p)
|
|
|
|
|
*return_value_p = ret_expr;
|
|
|
|
|
else
|
|
|
|
|
gcc_assert (*return_value_p == ret_expr);
|
|
|
|
|
q->cont_stmt = q->stmt.g;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* The nasty part about redirecting the return value is that the
|
|
|
|
|
return value itself is to be computed before the FINALLY block
|
|
|
|
|
is executed. e.g.
|
|
|
|
|
|
|
|
|
|
int x;
|
|
|
|
|
int foo (void)
|
|
|
|
|
{
|
|
|
|
|
x = 0;
|
|
|
|
|
try {
|
|
|
|
|
return x;
|
|
|
|
|
} finally {
|
|
|
|
|
x++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
should return 0, not 1. Arrange for this to happen by copying
|
|
|
|
|
computed the return value into a local temporary. This also
|
|
|
|
|
allows us to redirect multiple return statements through the
|
|
|
|
|
same destination block; whether this is a net win or not really
|
|
|
|
|
depends, I guess, but it does make generation of the switch in
|
|
|
|
|
lower_try_finally_switch easier. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (TREE_CODE (ret_expr) == RESULT_DECL)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
if (!*return_value_p)
|
|
|
|
|
*return_value_p = ret_expr;
|
|
|
|
|
else
|
targhooks.c (default_unwind_emit, [...]): Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* targhooks.c (default_unwind_emit, default_scalar_mode_supported_p):
Use gcc_assert, gcc_unreachable & internal_error instead of abort.
* timevar.c (timevar_push, timevar_pop, timevar_start,
timevar_stop): Likewise.
* toplev.c (default_pch_valid_p): Likewise.
* tracer.c (tail_duplicate): Likewise.
* tree-alias-common.c (get_alias_var_decl,
get_values_from_constructor, create_alias_var, delete_alias_vars,
empty_points_to_set, same_points_to_set, ptr_may_alias_var):
Likewise.
* tree.c (tree_size, make_node_stat, copy_node_stat,
build_int_cst_wide, integer_all_onesp, list_length, chainon,
tree_node_structure, type_contains_placeholder_p, substitute_in_expr,
substitute_placeholder_in_expr, tabilize_reference_1, build0_stat,
build1_stat, build2_stat, build3_stat, build4_stat, is_attribute_p,
lookup_attribute, type_hash_canon, host_integerp, iterative_hash_expr,
build_method_type_directly, decl_type_context, get_callee_fndecl,
get_set_constructor_bits, build_vector_type_for_mode, int_cst_value,
tree_fold_gcd): Likewise.
* tree-cfg.c (create_bb, make_ctrl_stmt_edges, make_exit_edges,
make_cond_expr_edges, group_case_labels, tree_merge_blocks,
cleanup_control_expr_graph, find_taken_edge,
find_taken_edge_switch_expr, phi_alternatives_equal,
is_ctrl_altering_stmt, disband_implicit_edges, set_bb_for_stmt,
stmt_for_bsi, tree_find_edge_insert_loc, bsi_insert_on_edge_immediate,
tree_split_edge, tree_verify_flow_info, thread_jumps,
tree_redirect_edge_and_branch, tree_flow_call_edges_add): Likewise.
* tree-chrec.c (chrec_fold_poly_cst, chrec_fold_plus_poly_poly,
chrec_fold_multiply_poly_poly): Likewise.
* tree-complex.c (extract_component, expand_complex_division,
expand_complex_comparison, expand_complex_operations_1,
build_replicated_const, expand_vector_operations_1): Likewise.
* tree-data-ref.c (tree_fold_bezout, build_classic_dist_vector,
build_classic_dir_vector): Likewise.
* tree-dfa.c (compute_immediate_uses_for_phi,
compute_immediate_uses_for_stmt, create_var_ann, create_stmt_ann,
create_tree_ann, collect_dfa_stats, get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-eh.c (record_stmt_eh_region, add_stmt_to_eh_region,
record_in_finally_tree, replace_goto_queue_1,
maybe_record_in_goto_queue, verify_norecord_switch_expr,
do_return_redirection): Likewise.
* tree-if-conv.c (tree_if_convert_stmt, tree_if_convert_cond_expr,
add_to_dst_predicate_list, find_phi_replacement_condition,
replace_phi_with_cond_modify_expr, get_loop_body_in_if_conv_order):
Likewise.
* tree-inline.c (remap_decl, remap_type, remap_decls, copy_body_r,
initialize_inlined_parameters, declare_return_variable,
estimate_num_insns_1, expand_call_inline, expand_calls_inline,
optimize_inline_calls, copy_tree_r): Likewise.
* tree-into-ssa.c (rewrite_initialize_block_local_data, rewrite_stmt,
ssa_rewrite_stmt, rewrite_into_ssa): Likewise.
* tree-iterator.c (alloc_stmt_list, tsi_link_before, tsi_link_after,
tsi_split_statement_list_after, tsi_split_statement_list_before):
Likewise.
* tree-mudflap.c (mf_varname_tree): Likewise.
* tree-nested.c (create_tmp_var_for, lookup_field_for_decl,
lookup_tramp_for_decl, convert_all_function_calls): Likewise.
* tree-optimize.c (tree_rest_of_compilation): Likewise.
* tree-outof-ssa.c (create_temp, eliminate_build, eliminate_phi,
coalesce_abnormal_edges, coalesce_ssa_name, eliminate_virtual_phis,
free_temp_expr_table, add_dependance, finish_expr, rewrite_trees):
Likewise.
* tree-phinodes.c (resize_phi_node, add_phi_arg,
remove_all_phi_nodes_for): Likewise.
* tree-pretty-print.c (op_prio, print_call_name): Likewise.
* tree-profile.c (tree_gen_interval_profiler, tree_gen_pow2_profiler,
tree_gen_one_value_profiler, tree_gen_const_delta_profiler): Likewise.
* tree-sra.c (type_can_instantiate_all_elements, sra_hash_tree,
sra_elt_eq, sra_walk_expr, instantiate_missing_elements,
generate_one_element_ref, generate_element_copy,
generate_element_zero, scalarize_copy, scalarize_init,
scalarize_ldst): Likewise.
* tree-ssa-alias.c (delete_alias_info, group_aliases, may_alias_p,
add_may_alias, add_pointed_to_expr, add_pointed_to_var,
collect_points_to_info_r, get_tmt_for, get_ptr_info): Likewise.
* tree-ssa.c (walk_use_def_chains, check_phi_redundancy): Likewise.
* tree-ssa-ccp.c (dump_lattice_value, get_default_value, get_value,
set_lattice_value, likely_value, ccp_visit_phi_node, visit_assignment,
widen_bitfield, ccp_fold_builtin): Likewise.
* tree-ssa-copy.c (may_propagate_copy, merge_alias_info,
replace_exp_1, propagate_tree_value): Likewise.
* tree-ssa-copyrename.c (copy_rename_partition_coalesce): Likewise.
* tree-ssa-dce.c (set_control_dependence_map_bit,
find_control_dependence, find_pdom, mark_operand_necessary,
mark_stmt_if_obviously_necessary,
mark_control_dependent_edges_necessary, remove_dead_stmt): Likewise.
* tree-ssa-dom.c (dom_opt_initialize_block_local_data,
simplify_switch_and_lookup_avail_expr, cprop_into_successor_phis,
eliminate_redundant_computations, avail_expr_eq): Likewise.
* tree-ssa-dse.c (fix_stmt_v_may_defs): Likewise.
* tree-ssa-loop-ch.c (should_duplicate_loop_header_p,
duplicate_blocks): Likewise.
* tree-ssa-loop-im.c (for_each_index, set_level,
is_call_clobbered_ref): Likewise.
* tree-ssa-loop-ivopts.c (dump_use, divide, stmt_after_ip_normal_pos,
stmt_after_increment, set_iv, contains_abnormal_ssa_name_p,
find_interesting_uses_outer_or_nonlin, add_derived_ivs_candidates,
peel_address, ptr_difference_cost, may_replace_final_value,
determine_use_iv_cost, rewrite_use_nonlinear_expr, rewrite_use_outer,
rewrite_use, rewrite_uses): Likewise.
* tree-ssa-loop-manip.c (rewrite_into_loop_closed_ssa,
check_loop_closed_ssa_use): Likewise.
* tree-ssanames.c (make_ssa_name): Likewise.
* tree-ssa-operands.c (finalize_ssa_defs, finalize_ssa_uses,
finalize_ssa_v_must_defs, finalize_ssa_stmt_operands,
get_stmt_operands, get_expr_operands, get_asm_expr_operands,
get_indirect_ref_operands, add_stmt_operand): Likewise.
* tree-ssa-pre.c (value_exists_in_set_bitmap,
value_remove_from_set_bitmap, bitmap_insert_into_set, insert_into_set,
phi_translate, valid_in_set, compute_antic,
find_or_generate_expression, create_expression_by_pieces, insert_aux,
create_value_expr_from, eliminate): Likewise.
* tree-ssa-propagate.c (cfg_blocks_get): Likewise.
* tree-ssa-threadupdate.c (remove_last_stmt_and_useless_edges):
Likewise.
* tree-tailcall.c (independent_of_stmt_p, adjust_return_value,
eliminate_tail_call): Likewise.
* tree-vectorizer.c (vect_create_index_for_array_ref,
vect_align_data_ref, vect_create_data_ref,
vect_create_destination_var, vect_get_vec_def_for_operand,
vect_finish_stmt_generation, vect_transform_stmt,
vect_transform_loop_bound, vect_transform_loop,
vect_analyze_operations): Likewise.
* tree-vn.c (vn_compute, set_value_handle, get_value_handle):
Likewise.
* tree-flow-inline.h (var_ann, get_var_ann, get_def_from_ptr,
get_use_op_ptr, immediate_use, phi_ssa_name_p, bsi_start,
bsi_after_labels, bsi_last): Likewise.
* tree-ssa-live.c (var_union, change_partition_var,
create_ssa_var_map, calculate_live_on_entry, root_var_init,
type_var_init, add_coalesce, sort_coalesce_list, pop_best_coalesce):
Likewise.
* tree-ssa-live.h (partition_is_global, live_entry_blocks,
tpa_find_tree): Likewise.
(register_ssa_partition_check): Declare.
(register_ssa_partition): use it.
* tree-ssa-live.c: Include errors.h.
(register_ssa_partition_check): New.
* tree-ssa-operands.c: Include errors.h.
* Makefile.in (tree-ssa-operands.o): Depend on errors.h.
Co-Authored-By: Nathan Sidwell <nathan@codesourcery.com>
From-SVN: r87223
2004-09-09 09:54:12 +02:00
|
|
|
|
gcc_assert (*return_value_p == ret_expr);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
q->cont_stmt = q->stmt.g;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
else
|
|
|
|
|
gcc_unreachable ();
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* If we don't return a value, all return statements are the same. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
q->cont_stmt = q->stmt.g;
|
|
|
|
|
|
|
|
|
|
if (!q->repl_stmt)
|
|
|
|
|
q->repl_stmt = gimple_seq_alloc ();
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (mod)
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&q->repl_stmt, mod);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_goto (finlab);
|
|
|
|
|
gimple_seq_add_stmt (&q->repl_stmt, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Similar, but easier, for GIMPLE_GOTO. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
do_goto_redirection (struct goto_queue_node *q, tree finlab, gimple_seq mod,
|
|
|
|
|
struct leh_tf_state *tf)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple x;
|
|
|
|
|
|
|
|
|
|
gcc_assert (q->is_label);
|
|
|
|
|
if (!q->repl_stmt)
|
|
|
|
|
q->repl_stmt = gimple_seq_alloc ();
|
|
|
|
|
|
|
|
|
|
q->cont_stmt = gimple_build_goto (VEC_index (tree, tf->dest_array,q->index));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (mod)
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&q->repl_stmt, mod);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_goto (finlab);
|
|
|
|
|
gimple_seq_add_stmt (&q->repl_stmt, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We want to transform
|
|
|
|
|
try { body; } catch { stuff; }
|
|
|
|
|
to
|
|
|
|
|
body; goto over; lab: stuff; over:
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
TP is a GIMPLE_TRY node. LAB is the label that
|
2004-05-13 08:41:07 +02:00
|
|
|
|
should be placed before the second operand, or NULL. OVER is
|
|
|
|
|
an existing label that should be put at the exit, or NULL. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static gimple_seq
|
|
|
|
|
frob_into_branch_around (gimple tp, tree lab, tree over)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple x;
|
|
|
|
|
gimple_seq cleanup, result;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
cleanup = gimple_try_cleanup (tp);
|
|
|
|
|
result = gimple_try_eval (tp);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (gimple_seq_may_fallthru (result))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
if (!over)
|
|
|
|
|
over = create_artificial_label ();
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_goto (over);
|
|
|
|
|
gimple_seq_add_stmt (&result, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lab)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (lab);
|
|
|
|
|
gimple_seq_add_stmt (&result, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&result, cleanup);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (over)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (over);
|
|
|
|
|
gimple_seq_add_stmt (&result, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return result;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_try_finally. Duplicate the tree rooted at T.
|
|
|
|
|
Make sure to record all new labels found. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static gimple_seq
|
|
|
|
|
lower_try_finally_dup_block (gimple_seq seq, struct leh_state *outer_state)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple region = NULL;
|
|
|
|
|
gimple_seq new_seq;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
new_seq = copy_gimple_seq_and_replace_locals (seq);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (outer_state->tf)
|
|
|
|
|
region = outer_state->tf->try_finally_expr;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
collect_finally_tree_1 (new_seq, region);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return new_seq;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_try_finally. Create a fallthru label for
|
|
|
|
|
the given try_finally state. The only tricky bit here is that
|
|
|
|
|
we have to make sure to record the label in our outer context. */
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
lower_try_finally_fallthru_label (struct leh_tf_state *tf)
|
|
|
|
|
{
|
|
|
|
|
tree label = tf->fallthru_label;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
treemple temp;
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (!label)
|
|
|
|
|
{
|
|
|
|
|
label = create_artificial_label ();
|
|
|
|
|
tf->fallthru_label = label;
|
|
|
|
|
if (tf->outer->tf)
|
2008-07-28 16:33:56 +02:00
|
|
|
|
{
|
|
|
|
|
temp.t = label;
|
|
|
|
|
record_in_finally_tree (temp, tf->outer->tf->try_finally_expr);
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
return label;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_try_finally. If lang_protect_cleanup_actions
|
|
|
|
|
returns non-null, then the language requires that the exception path out
|
|
|
|
|
of a try_finally be treated specially. To wit: the code within the
|
|
|
|
|
finally block may not itself throw an exception. We have two choices here.
|
|
|
|
|
First we can duplicate the finally block and wrap it in a must_not_throw
|
|
|
|
|
region. Second, we can generate code like
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
finally_block;
|
|
|
|
|
} catch {
|
|
|
|
|
if (fintmp == eh_edge)
|
|
|
|
|
protect_cleanup_actions;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
where "fintmp" is the temporary used in the switch statement generation
|
|
|
|
|
alternative considered below. For the nonce, we always choose the first
|
2004-08-19 23:34:37 +02:00
|
|
|
|
option.
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2005-02-24 22:47:26 +01:00
|
|
|
|
THIS_STATE may be null if this is a try-cleanup, not a try-finally. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
honor_protect_cleanup_actions (struct leh_state *outer_state,
|
|
|
|
|
struct leh_state *this_state,
|
|
|
|
|
struct leh_tf_state *tf)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple protect_cleanup_actions;
|
|
|
|
|
gimple_stmt_iterator gsi;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
bool finally_may_fallthru;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq finally;
|
|
|
|
|
gimple x;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* First check for nothing to do. */
|
|
|
|
|
if (lang_protect_cleanup_actions)
|
|
|
|
|
protect_cleanup_actions = lang_protect_cleanup_actions ();
|
|
|
|
|
else
|
|
|
|
|
protect_cleanup_actions = NULL;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
finally = gimple_try_cleanup (tf->top_p);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* If the EH case of the finally block can fall through, this may be a
|
|
|
|
|
structure of the form
|
|
|
|
|
try {
|
|
|
|
|
try {
|
|
|
|
|
throw ...;
|
|
|
|
|
} cleanup {
|
|
|
|
|
try {
|
|
|
|
|
throw ...;
|
|
|
|
|
} catch (...) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} catch (...) {
|
|
|
|
|
yyy;
|
|
|
|
|
}
|
|
|
|
|
E.g. with an inline destructor with an embedded try block. In this
|
|
|
|
|
case we must save the runtime EH data around the nested exception.
|
|
|
|
|
|
|
|
|
|
This complication means that any time the previous runtime data might
|
|
|
|
|
be used (via fallthru from the finally) we handle the eh case here,
|
|
|
|
|
whether or not protect_cleanup_actions is active. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
finally_may_fallthru = gimple_seq_may_fallthru (finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (!finally_may_fallthru && !protect_cleanup_actions)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Duplicate the FINALLY block. Only need to do this for try-finally,
|
|
|
|
|
and not for cleanups. */
|
|
|
|
|
if (this_state)
|
|
|
|
|
finally = lower_try_finally_dup_block (finally, outer_state);
|
|
|
|
|
|
2008-01-22 05:53:33 +01:00
|
|
|
|
/* If this cleanup consists of a TRY_CATCH_EXPR with TRY_CATCH_IS_CLEANUP
|
|
|
|
|
set, the handler of the TRY_CATCH_EXPR is another cleanup which ought
|
|
|
|
|
to be in an enclosing scope, but needs to be implemented at this level
|
|
|
|
|
to avoid a nesting violation (see wrap_temporary_cleanups in
|
|
|
|
|
cp/decl.c). Since it's logically at an outer level, we should call
|
|
|
|
|
terminate before we get to it, so strip it away before adding the
|
|
|
|
|
MUST_NOT_THROW filter. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi = gsi_start (finally);
|
|
|
|
|
x = gsi_stmt (gsi);
|
2008-01-22 05:53:33 +01:00
|
|
|
|
if (protect_cleanup_actions
|
2008-07-28 16:33:56 +02:00
|
|
|
|
&& gimple_code (x) == GIMPLE_TRY
|
|
|
|
|
&& gimple_try_kind (x) == GIMPLE_TRY_CATCH
|
|
|
|
|
&& gimple_try_catch_is_cleanup (x))
|
2008-01-22 05:53:33 +01:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi_insert_seq_before (&gsi, gimple_try_eval (x), GSI_SAME_STMT);
|
|
|
|
|
gsi_remove (&gsi, false);
|
2008-01-22 05:53:33 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* Resume execution after the exception. Adding this now lets
|
|
|
|
|
lower_eh_filter not add unnecessary gotos, as it is clear that
|
|
|
|
|
we never fallthru from this copy of the finally block. */
|
|
|
|
|
if (finally_may_fallthru)
|
|
|
|
|
{
|
2004-12-02 16:56:29 +01:00
|
|
|
|
tree save_eptr, save_filt;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree tmp;
|
2004-12-02 16:56:29 +01:00
|
|
|
|
|
|
|
|
|
save_eptr = create_tmp_var (ptr_type_node, "save_eptr");
|
|
|
|
|
save_filt = create_tmp_var (integer_type_node, "save_filt");
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi = gsi_start (finally);
|
|
|
|
|
tmp = build0 (EXC_PTR_EXPR, ptr_type_node);
|
|
|
|
|
x = gimple_build_assign (save_eptr, tmp);
|
|
|
|
|
gsi_insert_before (&gsi, x, GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tmp = build0 (FILTER_EXPR, integer_type_node);
|
|
|
|
|
x = gimple_build_assign (save_filt, tmp);
|
|
|
|
|
gsi_insert_before (&gsi, x, GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi = gsi_last (finally);
|
|
|
|
|
tmp = build0 (EXC_PTR_EXPR, ptr_type_node);
|
|
|
|
|
x = gimple_build_assign (tmp, save_eptr);
|
|
|
|
|
gsi_insert_after (&gsi, x, GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tmp = build0 (FILTER_EXPR, integer_type_node);
|
|
|
|
|
x = gimple_build_assign (tmp, save_filt);
|
|
|
|
|
gsi_insert_after (&gsi, x, GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_resx (get_eh_region_number (tf->region));
|
|
|
|
|
gsi_insert_after (&gsi, x, GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Wrap the block with protect_cleanup_actions as the action. */
|
|
|
|
|
if (protect_cleanup_actions)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq seq = NULL, failure = NULL;
|
|
|
|
|
|
|
|
|
|
gimple_seq_add_stmt (&failure, protect_cleanup_actions);
|
|
|
|
|
x = gimple_build_eh_filter (NULL, failure);
|
|
|
|
|
gimple_eh_filter_set_must_not_throw (x, 1);
|
|
|
|
|
|
|
|
|
|
gimple_seq_add_stmt (&seq, x);
|
|
|
|
|
x = gimple_build_try (finally, seq, GIMPLE_TRY_CATCH);
|
|
|
|
|
finally = lower_eh_filter (outer_state, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (outer_state, finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Hook this up to the end of the existing try block. If we
|
|
|
|
|
previously fell through the end, we'll have to branch around.
|
|
|
|
|
This means adding a new goto, and adding it to the queue. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi = gsi_last (gimple_try_eval (tf->top_p));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (tf->may_fallthru)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree tmp;
|
|
|
|
|
tmp = lower_try_finally_fallthru_label (tf);
|
|
|
|
|
x = gimple_build_goto (tmp);
|
|
|
|
|
gsi_insert_after (&gsi, x, GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (this_state)
|
|
|
|
|
maybe_record_in_goto_queue (this_state, x);
|
|
|
|
|
|
|
|
|
|
tf->may_fallthru = false;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (tf->eh_label);
|
|
|
|
|
gsi_insert_after (&gsi, x, GSI_CONTINUE_LINKING);
|
|
|
|
|
gsi_insert_seq_after (&gsi, finally, GSI_CONTINUE_LINKING);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Having now been handled, EH isn't to be considered with
|
|
|
|
|
the rest of the outgoing edges. */
|
|
|
|
|
tf->may_throw = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_try_finally. We have determined that there is
|
|
|
|
|
no fallthru edge out of the finally block. This means that there is
|
|
|
|
|
no outgoing edge corresponding to any incoming edge. Restructure the
|
|
|
|
|
try_finally node for this special case. */
|
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_try_finally_nofallthru (struct leh_state *state,
|
|
|
|
|
struct leh_tf_state *tf)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree lab, return_val;
|
|
|
|
|
gimple x;
|
|
|
|
|
gimple_seq finally;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
struct goto_queue_node *q, *qe;
|
|
|
|
|
|
|
|
|
|
if (tf->may_throw)
|
|
|
|
|
lab = tf->eh_label;
|
|
|
|
|
else
|
|
|
|
|
lab = create_artificial_label ();
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* We expect that tf->top_p is a GIMPLE_TRY. */
|
|
|
|
|
finally = gimple_try_cleanup (tf->top_p);
|
|
|
|
|
tf->top_p_seq = gimple_try_eval (tf->top_p);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (lab);
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
return_val = NULL;
|
|
|
|
|
q = tf->goto_queue;
|
|
|
|
|
qe = q + tf->goto_queue_active;
|
|
|
|
|
for (; q < qe; ++q)
|
|
|
|
|
if (q->index < 0)
|
|
|
|
|
do_return_redirection (q, lab, NULL, &return_val);
|
|
|
|
|
else
|
2008-07-28 16:33:56 +02:00
|
|
|
|
do_goto_redirection (q, lab, NULL, tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
replace_goto_queue (tf);
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (state, finally);
|
|
|
|
|
gimple_seq_add_seq (&tf->top_p_seq, finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_try_finally. We have determined that there is
|
|
|
|
|
exactly one destination of the finally block. Restructure the
|
|
|
|
|
try_finally node for this special case. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
lower_try_finally_onedest (struct leh_state *state, struct leh_tf_state *tf)
|
|
|
|
|
{
|
|
|
|
|
struct goto_queue_node *q, *qe;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple x;
|
|
|
|
|
gimple_seq finally;
|
|
|
|
|
tree finally_label;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
finally = gimple_try_cleanup (tf->top_p);
|
|
|
|
|
tf->top_p_seq = gimple_try_eval (tf->top_p);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (state, finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (tf->may_throw)
|
|
|
|
|
{
|
|
|
|
|
/* Only reachable via the exception edge. Add the given label to
|
|
|
|
|
the head of the FINALLY block. Append a RESX at the end. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (tf->eh_label);
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&tf->top_p_seq, finally);
|
2004-08-19 23:34:37 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_resx (get_eh_region_number (tf->region));
|
2005-05-11 18:25:30 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (tf->may_fallthru)
|
|
|
|
|
{
|
|
|
|
|
/* Only reachable via the fallthru edge. Do nothing but let
|
|
|
|
|
the two blocks run together; we'll fall out the bottom. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&tf->top_p_seq, finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
finally_label = create_artificial_label ();
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (finally_label);
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&tf->top_p_seq, finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
q = tf->goto_queue;
|
|
|
|
|
qe = q + tf->goto_queue_active;
|
|
|
|
|
|
|
|
|
|
if (tf->may_return)
|
|
|
|
|
{
|
|
|
|
|
/* Reachable by return expressions only. Redirect them. */
|
|
|
|
|
tree return_val = NULL;
|
|
|
|
|
for (; q < qe; ++q)
|
|
|
|
|
do_return_redirection (q, finally_label, NULL, &return_val);
|
|
|
|
|
replace_goto_queue (tf);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Reachable by goto expressions only. Redirect them. */
|
|
|
|
|
for (; q < qe; ++q)
|
2008-07-28 16:33:56 +02:00
|
|
|
|
do_goto_redirection (q, finally_label, NULL, tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
replace_goto_queue (tf);
|
2004-08-19 23:34:37 +02:00
|
|
|
|
|
2005-05-14 05:25:44 +02:00
|
|
|
|
if (VEC_index (tree, tf->dest_array, 0) == tf->fallthru_label)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
/* Reachable by goto to fallthru label only. Redirect it
|
|
|
|
|
to the new label (already created, sadly), and do not
|
|
|
|
|
emit the final branch out, or the fallthru label. */
|
|
|
|
|
tf->fallthru_label = NULL;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Place the original return/goto to the original destination
|
|
|
|
|
immediately after the finally block. */
|
|
|
|
|
x = tf->goto_queue[0].cont_stmt;
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
|
|
|
|
maybe_record_in_goto_queue (state, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_try_finally. There are multiple edges incoming
|
|
|
|
|
and outgoing from the finally block. Implement this by duplicating the
|
|
|
|
|
finally block for every destination. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
lower_try_finally_copy (struct leh_state *state, struct leh_tf_state *tf)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq finally;
|
|
|
|
|
gimple_seq new_stmt;
|
|
|
|
|
gimple_seq seq;
|
|
|
|
|
gimple x;
|
|
|
|
|
tree tmp;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
finally = gimple_try_cleanup (tf->top_p);
|
|
|
|
|
tf->top_p_seq = gimple_try_eval (tf->top_p);
|
|
|
|
|
new_stmt = NULL;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (tf->may_fallthru)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
seq = lower_try_finally_dup_block (finally, state);
|
|
|
|
|
lower_eh_constructs_1 (state, seq);
|
|
|
|
|
gimple_seq_add_seq (&new_stmt, seq);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tmp = lower_try_finally_fallthru_label (tf);
|
|
|
|
|
x = gimple_build_goto (tmp);
|
|
|
|
|
gimple_seq_add_stmt (&new_stmt, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (tf->may_throw)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (tf->eh_label);
|
|
|
|
|
gimple_seq_add_stmt (&new_stmt, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
seq = lower_try_finally_dup_block (finally, state);
|
|
|
|
|
lower_eh_constructs_1 (state, seq);
|
|
|
|
|
gimple_seq_add_seq (&new_stmt, seq);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_resx (get_eh_region_number (tf->region));
|
|
|
|
|
gimple_seq_add_stmt (&new_stmt, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (tf->goto_queue)
|
|
|
|
|
{
|
|
|
|
|
struct goto_queue_node *q, *qe;
|
|
|
|
|
tree return_val = NULL;
|
2005-04-14 20:44:09 +02:00
|
|
|
|
int return_index, index;
|
2005-12-18 02:19:20 +01:00
|
|
|
|
struct labels_s
|
2005-04-14 20:44:09 +02:00
|
|
|
|
{
|
|
|
|
|
struct goto_queue_node *q;
|
|
|
|
|
tree label;
|
|
|
|
|
} *labels;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2005-05-14 05:25:44 +02:00
|
|
|
|
return_index = VEC_length (tree, tf->dest_array);
|
2005-12-18 02:19:20 +01:00
|
|
|
|
labels = XCNEWVEC (struct labels_s, return_index + 1);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
q = tf->goto_queue;
|
|
|
|
|
qe = q + tf->goto_queue_active;
|
|
|
|
|
for (; q < qe; q++)
|
|
|
|
|
{
|
2005-04-14 20:44:09 +02:00
|
|
|
|
index = q->index < 0 ? return_index : q->index;
|
|
|
|
|
|
|
|
|
|
if (!labels[index].q)
|
|
|
|
|
labels[index].q = q;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (index = 0; index < return_index + 1; index++)
|
|
|
|
|
{
|
|
|
|
|
tree lab;
|
|
|
|
|
|
|
|
|
|
q = labels[index].q;
|
|
|
|
|
if (! q)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
lab = labels[index].label = create_artificial_label ();
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (index == return_index)
|
|
|
|
|
do_return_redirection (q, lab, NULL, &return_val);
|
|
|
|
|
else
|
2008-07-28 16:33:56 +02:00
|
|
|
|
do_goto_redirection (q, lab, NULL, tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (lab);
|
|
|
|
|
gimple_seq_add_stmt (&new_stmt, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
seq = lower_try_finally_dup_block (finally, state);
|
|
|
|
|
lower_eh_constructs_1 (state, seq);
|
|
|
|
|
gimple_seq_add_seq (&new_stmt, seq);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_stmt (&new_stmt, q->cont_stmt);
|
2005-04-14 20:44:09 +02:00
|
|
|
|
maybe_record_in_goto_queue (state, q->cont_stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
2005-04-14 20:44:09 +02:00
|
|
|
|
|
|
|
|
|
for (q = tf->goto_queue; q < qe; q++)
|
|
|
|
|
{
|
|
|
|
|
tree lab;
|
|
|
|
|
|
|
|
|
|
index = q->index < 0 ? return_index : q->index;
|
|
|
|
|
|
|
|
|
|
if (labels[index].q == q)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
lab = labels[index].label;
|
|
|
|
|
|
|
|
|
|
if (index == return_index)
|
|
|
|
|
do_return_redirection (q, lab, NULL, &return_val);
|
|
|
|
|
else
|
2008-07-28 16:33:56 +02:00
|
|
|
|
do_goto_redirection (q, lab, NULL, tf);
|
2005-04-14 20:44:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
replace_goto_queue (tf);
|
|
|
|
|
free (labels);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Need to link new stmts after running replace_goto_queue due
|
|
|
|
|
to not wanting to process the same goto stmts twice. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&tf->top_p_seq, new_stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_try_finally. There are multiple edges incoming
|
|
|
|
|
and outgoing from the finally block. Implement this by instrumenting
|
|
|
|
|
each incoming edge and creating a switch statement at the end of the
|
|
|
|
|
finally block that branches to the appropriate destination. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
lower_try_finally_switch (struct leh_state *state, struct leh_tf_state *tf)
|
|
|
|
|
{
|
|
|
|
|
struct goto_queue_node *q, *qe;
|
|
|
|
|
tree return_val = NULL;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree finally_tmp, finally_label;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
int return_index, eh_index, fallthru_index;
|
|
|
|
|
int nlabels, ndests, j, last_case_index;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree last_case;
|
|
|
|
|
VEC (tree,heap) *case_label_vec;
|
|
|
|
|
gimple_seq switch_body;
|
|
|
|
|
gimple x;
|
|
|
|
|
tree tmp;
|
|
|
|
|
gimple switch_stmt;
|
|
|
|
|
gimple_seq finally;
|
|
|
|
|
struct pointer_map_t *cont_map = NULL;
|
|
|
|
|
|
|
|
|
|
switch_body = gimple_seq_alloc ();
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Mash the TRY block to the head of the chain. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
finally = gimple_try_cleanup (tf->top_p);
|
|
|
|
|
tf->top_p_seq = gimple_try_eval (tf->top_p);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Lower the finally block itself. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (state, finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Prepare for switch statement generation. */
|
2005-05-14 05:25:44 +02:00
|
|
|
|
nlabels = VEC_length (tree, tf->dest_array);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return_index = nlabels;
|
|
|
|
|
eh_index = return_index + tf->may_return;
|
|
|
|
|
fallthru_index = eh_index + tf->may_throw;
|
|
|
|
|
ndests = fallthru_index + tf->may_fallthru;
|
|
|
|
|
|
|
|
|
|
finally_tmp = create_tmp_var (integer_type_node, "finally_tmp");
|
|
|
|
|
finally_label = create_artificial_label ();
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* We use VEC_quick_push on case_label_vec throughout this function,
|
|
|
|
|
since we know the size in advance and allocate precisely as muce
|
|
|
|
|
space as needed. */
|
|
|
|
|
case_label_vec = VEC_alloc (tree, heap, ndests);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
last_case = NULL;
|
|
|
|
|
last_case_index = 0;
|
|
|
|
|
|
|
|
|
|
/* Begin inserting code for getting to the finally block. Things
|
|
|
|
|
are done in this order to correspond to the sequence the code is
|
|
|
|
|
layed out. */
|
|
|
|
|
|
|
|
|
|
if (tf->may_fallthru)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_assign (finally_tmp, build_int_cst (integer_type_node,
|
|
|
|
|
fallthru_index));
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (tf->may_throw)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_goto (finally_label);
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
tree-ssa-loop-im.c (schedule_sm): Use buildN instead of build.
2005-12-02 Richard Guenther <rguenther@suse.de>
* tree-ssa-loop-im.c (schedule_sm): Use buildN instead of build.
* tree-complex.c (update_complex_assignment, expand_complex_div_wide):
Likewise.
* tree-ssa-ccp.c (maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref): Likewise.
* tree-ssa-dom.c (thread_across_edge,
simplify_rhs_and_lookup_avail_expr,
find_equivalent_equality_comparison, record_equivalences_from_stmt):
Likewise.
* gimple-low.c (lower_function_body, lower_return_expr): Likewise.
* tree-eh.c (do_return_redirection, honor_protect_cleanup_actions,
lower_try_finally_switch): Likewise.
* tree-if-conv.c (add_to_dst_predicate_list,
replace_phi_with_cond_modify_expr, ifc_temp_var): Likewise.
* gimplify.c (internal_get_tmp_var, gimple_build_eh_filter,
voidify_wrapper_expr, build_stack_save_restore, gimplify_bind_expr,
gimplify_return_expr, gimplify_decl_expr, gimplify_switch_expr,
gimplify_case_label_expr, gimplify_exit_expr, gimplify_self_mod_expr,
shortcut_cond_r, shortcut_cond_expr, gimplify_cond_expr,
gimplify_init_ctor_eval, gimplify_init_constructor,
gimplify_variable_sized_compare, gimplify_boolean_expr,
gimplify_cleanup_point_expr, gimple_push_cleanup, gimplify_target_expr,
gimplify_expr, gimplify_body, gimplify_function_tree,
force_gimple_operand): Likewise.
* tree-ssa-pre.c (create_expression_by_pieces): Likewise.
* tree-mudflap.c (mf_decl_cache_locals, mf_build_check_statement_for,
mx_register_decls): Likewise.
* tree-nested.c (init_tmp_var, save_tmp_var, get_static_chain,
get_frame_field, finalize_nesting_tree_1): Likewise.
* tree-inline.c (setup_one_parameter): Likewise.
* tree-vect-transform.c (vectorizable_condition): Likewise.
* tree-outof-ssa.c (insert_copy_on_edge, insert_backedge_copies):
Likewise.
* tree-profile.c (tree_gen_edge_profiler): Likewise.
* tree-cfg.c (factor_computed_gotos, gimplify_val): Likewise.
* c-parser.c (c_parser_if_body, c_parser_switch_statement): Likewise.
* tree-chrec.h (build_polynomial_chrec): Likewise.
From-SVN: r107907
2005-12-02 18:09:40 +01:00
|
|
|
|
last_case = build3 (CASE_LABEL_EXPR, void_type_node,
|
|
|
|
|
build_int_cst (NULL_TREE, fallthru_index), NULL,
|
|
|
|
|
create_artificial_label ());
|
2008-07-28 16:33:56 +02:00
|
|
|
|
VEC_quick_push (tree, case_label_vec, last_case);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
last_case_index++;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (CASE_LABEL (last_case));
|
|
|
|
|
gimple_seq_add_stmt (&switch_body, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tmp = lower_try_finally_fallthru_label (tf);
|
|
|
|
|
x = gimple_build_goto (tmp);
|
|
|
|
|
gimple_seq_add_stmt (&switch_body, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (tf->may_throw)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (tf->eh_label);
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_assign (finally_tmp, build_int_cst (integer_type_node,
|
|
|
|
|
eh_index));
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
tree-ssa-loop-im.c (schedule_sm): Use buildN instead of build.
2005-12-02 Richard Guenther <rguenther@suse.de>
* tree-ssa-loop-im.c (schedule_sm): Use buildN instead of build.
* tree-complex.c (update_complex_assignment, expand_complex_div_wide):
Likewise.
* tree-ssa-ccp.c (maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref): Likewise.
* tree-ssa-dom.c (thread_across_edge,
simplify_rhs_and_lookup_avail_expr,
find_equivalent_equality_comparison, record_equivalences_from_stmt):
Likewise.
* gimple-low.c (lower_function_body, lower_return_expr): Likewise.
* tree-eh.c (do_return_redirection, honor_protect_cleanup_actions,
lower_try_finally_switch): Likewise.
* tree-if-conv.c (add_to_dst_predicate_list,
replace_phi_with_cond_modify_expr, ifc_temp_var): Likewise.
* gimplify.c (internal_get_tmp_var, gimple_build_eh_filter,
voidify_wrapper_expr, build_stack_save_restore, gimplify_bind_expr,
gimplify_return_expr, gimplify_decl_expr, gimplify_switch_expr,
gimplify_case_label_expr, gimplify_exit_expr, gimplify_self_mod_expr,
shortcut_cond_r, shortcut_cond_expr, gimplify_cond_expr,
gimplify_init_ctor_eval, gimplify_init_constructor,
gimplify_variable_sized_compare, gimplify_boolean_expr,
gimplify_cleanup_point_expr, gimple_push_cleanup, gimplify_target_expr,
gimplify_expr, gimplify_body, gimplify_function_tree,
force_gimple_operand): Likewise.
* tree-ssa-pre.c (create_expression_by_pieces): Likewise.
* tree-mudflap.c (mf_decl_cache_locals, mf_build_check_statement_for,
mx_register_decls): Likewise.
* tree-nested.c (init_tmp_var, save_tmp_var, get_static_chain,
get_frame_field, finalize_nesting_tree_1): Likewise.
* tree-inline.c (setup_one_parameter): Likewise.
* tree-vect-transform.c (vectorizable_condition): Likewise.
* tree-outof-ssa.c (insert_copy_on_edge, insert_backedge_copies):
Likewise.
* tree-profile.c (tree_gen_edge_profiler): Likewise.
* tree-cfg.c (factor_computed_gotos, gimplify_val): Likewise.
* c-parser.c (c_parser_if_body, c_parser_switch_statement): Likewise.
* tree-chrec.h (build_polynomial_chrec): Likewise.
From-SVN: r107907
2005-12-02 18:09:40 +01:00
|
|
|
|
last_case = build3 (CASE_LABEL_EXPR, void_type_node,
|
|
|
|
|
build_int_cst (NULL_TREE, eh_index), NULL,
|
|
|
|
|
create_artificial_label ());
|
2008-07-28 16:33:56 +02:00
|
|
|
|
VEC_quick_push (tree, case_label_vec, last_case);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
last_case_index++;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (CASE_LABEL (last_case));
|
|
|
|
|
gimple_seq_add_stmt (&switch_body, x);
|
|
|
|
|
x = gimple_build_resx (get_eh_region_number (tf->region));
|
|
|
|
|
gimple_seq_add_stmt (&switch_body, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (finally_label);
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq_add_seq (&tf->top_p_seq, finally);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Redirect each incoming goto edge. */
|
|
|
|
|
q = tf->goto_queue;
|
|
|
|
|
qe = q + tf->goto_queue_active;
|
|
|
|
|
j = last_case_index + tf->may_return;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Prepare the assignments to finally_tmp that are executed upon the
|
|
|
|
|
entrance through a particular edge. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
for (; q < qe; ++q)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq mod;
|
|
|
|
|
int switch_id;
|
|
|
|
|
unsigned int case_index;
|
|
|
|
|
|
|
|
|
|
mod = gimple_seq_alloc ();
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (q->index < 0)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_assign (finally_tmp,
|
|
|
|
|
build_int_cst (integer_type_node,
|
|
|
|
|
return_index));
|
|
|
|
|
gimple_seq_add_stmt (&mod, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
do_return_redirection (q, finally_label, mod, &return_val);
|
|
|
|
|
switch_id = return_index;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_assign (finally_tmp,
|
|
|
|
|
build_int_cst (integer_type_node, q->index));
|
|
|
|
|
gimple_seq_add_stmt (&mod, x);
|
|
|
|
|
do_goto_redirection (q, finally_label, mod, tf);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
switch_id = q->index;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case_index = j + q->index;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (VEC_length (tree, case_label_vec) <= case_index
|
|
|
|
|
|| !VEC_index (tree, case_label_vec, case_index))
|
|
|
|
|
{
|
|
|
|
|
tree case_lab;
|
|
|
|
|
void **slot;
|
|
|
|
|
case_lab = build3 (CASE_LABEL_EXPR, void_type_node,
|
|
|
|
|
build_int_cst (NULL_TREE, switch_id), NULL,
|
|
|
|
|
NULL);
|
|
|
|
|
/* We store the cont_stmt in the pointer map, so that we can recover
|
|
|
|
|
it in the loop below. We don't create the new label while
|
|
|
|
|
walking the goto_queue because pointers don't offer a stable
|
|
|
|
|
order. */
|
|
|
|
|
if (!cont_map)
|
|
|
|
|
cont_map = pointer_map_create ();
|
|
|
|
|
slot = pointer_map_insert (cont_map, case_lab);
|
|
|
|
|
*slot = q->cont_stmt;
|
|
|
|
|
VEC_quick_push (tree, case_label_vec, case_lab);
|
|
|
|
|
}
|
2005-04-14 20:44:09 +02:00
|
|
|
|
}
|
|
|
|
|
for (j = last_case_index; j < last_case_index + nlabels; j++)
|
|
|
|
|
{
|
|
|
|
|
tree label;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple cont_stmt;
|
|
|
|
|
void **slot;
|
2005-04-14 20:44:09 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
last_case = VEC_index (tree, case_label_vec, j);
|
2005-04-14 20:44:09 +02:00
|
|
|
|
|
|
|
|
|
gcc_assert (last_case);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gcc_assert (cont_map);
|
2005-04-14 20:44:09 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
slot = pointer_map_contains (cont_map, last_case);
|
|
|
|
|
/* As the comment above suggests, CASE_LABEL (last_case) was just a
|
|
|
|
|
placeholder, it does not store an actual label, yet. */
|
|
|
|
|
gcc_assert (slot);
|
|
|
|
|
cont_stmt = *(gimple *) slot;
|
2005-04-14 20:44:09 +02:00
|
|
|
|
|
|
|
|
|
label = create_artificial_label ();
|
|
|
|
|
CASE_LABEL (last_case) = label;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (label);
|
|
|
|
|
gimple_seq_add_stmt (&switch_body, x);
|
|
|
|
|
gimple_seq_add_stmt (&switch_body, cont_stmt);
|
2005-04-14 20:44:09 +02:00
|
|
|
|
maybe_record_in_goto_queue (state, cont_stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (cont_map)
|
|
|
|
|
pointer_map_destroy (cont_map);
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
replace_goto_queue (tf);
|
|
|
|
|
|
2004-05-30 20:19:18 +02:00
|
|
|
|
/* Make sure that the last case is the default label, as one is required.
|
|
|
|
|
Then sort the labels, which is also required in GIMPLE. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
CASE_LOW (last_case) = NULL;
|
2004-05-30 20:19:18 +02:00
|
|
|
|
sort_case_labels (case_label_vec);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Build the switch statement, setting last_case to be the default
|
|
|
|
|
label. */
|
|
|
|
|
switch_stmt = gimple_build_switch_vec (finally_tmp, last_case,
|
|
|
|
|
case_label_vec);
|
|
|
|
|
|
|
|
|
|
/* Need to link SWITCH_STMT after running replace_goto_queue
|
|
|
|
|
due to not wanting to process the same goto stmts twice. */
|
|
|
|
|
gimple_seq_add_stmt (&tf->top_p_seq, switch_stmt);
|
|
|
|
|
gimple_seq_add_seq (&tf->top_p_seq, switch_body);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Decide whether or not we are going to duplicate the finally block.
|
|
|
|
|
There are several considerations.
|
|
|
|
|
|
|
|
|
|
First, if this is Java, then the finally block contains code
|
|
|
|
|
written by the user. It has line numbers associated with it,
|
|
|
|
|
so duplicating the block means it's difficult to set a breakpoint.
|
|
|
|
|
Since controlling code generation via -g is verboten, we simply
|
|
|
|
|
never duplicate code without optimization.
|
|
|
|
|
|
|
|
|
|
Second, we'd like to prevent egregious code growth. One way to
|
|
|
|
|
do this is to estimate the size of the finally block, multiply
|
|
|
|
|
that by the number of copies we'd need to make, and compare against
|
|
|
|
|
the estimate of the size of the switch machinery we'd have to add. */
|
|
|
|
|
|
|
|
|
|
static bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
decide_copy_try_finally (int ndests, gimple_seq finally)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
int f_estimate, sw_estimate;
|
|
|
|
|
|
|
|
|
|
if (!optimize)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* Finally estimate N times, plus N gotos. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
f_estimate = count_insns_seq (finally, &eni_size_weights);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
f_estimate = (f_estimate + 1) * ndests;
|
|
|
|
|
|
|
|
|
|
/* Switch statement (cost 10), N variable assignments, N gotos. */
|
|
|
|
|
sw_estimate = 10 + 2 * ndests;
|
|
|
|
|
|
|
|
|
|
/* Optimize for size clearly wants our best guess. */
|
loop-unswitch.c (unswitch_single_loop): Use optimize_loop_for_speed_p.
* loop-unswitch.c (unswitch_single_loop): Use optimize_loop_for_speed_p.
* tree-ssa-threadupdate.c (mark_threaded_blocks): Use optimize_function_for_size_p.
* tracer.c (ignore_bb_p): Use optimize_bb_for_size_p.
* postreload-gcse.c (eliminate_partially_redundant_load): Use optimize_bb_for_size_p.
* value-prof.c (gimple_divmod_fixed_value_transform,
gimple_mod_pow2_value_transform, gimple_mod_subtract_transform,
gimple_stringops_transform): Use optimize_bb_for_size_p.
* ipa-cp.c (ipcp_insert_stage): Use optimize_function_for_size_p.
* final.c (compute_alignments): Use optimize_function_for_size_p.
* builtins.c (fold_builtin_cabs): Use optimize_function_for_speed_p.
(fold_builtin_strcpy, fold_builtin_fputs): Use
optimize_function_for_size_p.
* fold-const.c (tree_swap_operands_p): Use optimize_function_for_size_p.
* recog.c (relax_delay_slots): Likewise.
* tree-ssa-math-opts.c (replace_reciprocal): Use optimize_bb_for_speed_p.
(execute_cse_reciprocals): Use optimize_bb_for_size_p.
* ipa-inline.c (cgraph_decide_recursive_inlining): Use
optimize_function_for_size_p.
(cgraph_decide_inlining_of_small_function): Use
optimize_function_for_size_p.
* global.c (find_reg): Use optimize_function_for_size_p.
* opts.c (decode_options): Do not clear flag_tree_ch, flag_inline_functions,
flag_unswitch_loops, flag_unroll_loops, flag_unroll_all_loops and
flag_prefetch_loop_arrays. Those can work it out from profile.
* tree-ssa-loop-ivcanon.c (tree_unroll_loops_completely): Use
optimize_loop_for_speed_p.
* predict.c (optimize_bb_for_size_p, optimize_bb_for_speed_p): Constify
argument.
(optimize_loop_nest_for_size_p, optimize_loop_nest_for_speed_p): New.
* tree-parloops.c (parallelize_loops): Use optimize_loop_for_size_p.
* tree-eh.c (decide_copy_try_finally): Use optimize_function_for_size_p.
* local-alloc.c (block_alloc): Pass BB pointer.
(find_free_reg): Add BB pointer, use optimize_bb_for_size_p.
* gcse.c (gcse_main): Use optimize_function_for_size_p.
* loop-unroll.c (decide_unrolling_and_peeling): Use optimize_loop_for_size_p.
(decide_peel_completely): Likewise.
* tree-vect-analyze.c (vect_mark_for_runtime_alias_test): Use
optimize_loop_for_size_p.
(vect_enhance_data_refs_alignment): Likewise.
* tree-ssa-coalesce.c (coalesce_cost): Add optimize_for_size argument.
(coalesce_cost_bb, coalesce_cost_edge, create_outofssa_var_map): Update call.
* cfgcleanup.c (outgoing_edges_match): Use optimize_bb_for_speed_p.
(try_crossjump_bb): Use optimize_bb_for_size_p.
* tree-ssa-loop-prefetch.c (loop_prefetch_arrays): Use
optimize_loop_for_speed_p.
* bb-reorder.c (find_traces_1_round): Likewise.
(copy_bb): Use optimize_bb_for_speed_p.
(duplicate_computed_gotos): Likewise.
* basic-block.h (optimize_loop_nest_for_size_p,
optimize_loop_nest_for_speed_p): New.
* stmt.c (expand_case): Use optimize_insn_for_size_p.
From-SVN: r139760
2008-08-29 12:35:57 +02:00
|
|
|
|
if (optimize_function_for_size_p (cfun))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return f_estimate < sw_estimate;
|
|
|
|
|
|
|
|
|
|
/* ??? These numbers are completely made up so far. */
|
|
|
|
|
if (optimize > 1)
|
2004-06-19 00:32:49 +02:00
|
|
|
|
return f_estimate < 100 || f_estimate < sw_estimate * 2;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
else
|
2004-06-19 00:32:49 +02:00
|
|
|
|
return f_estimate < 40 || f_estimate * 2 < sw_estimate * 3;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* A subroutine of lower_eh_constructs_1. Lower a GIMPLE_TRY_FINALLY nodes
|
2004-05-13 08:41:07 +02:00
|
|
|
|
to a sequence of labels and blocks, plus the exception region trees
|
2004-08-19 23:34:37 +02:00
|
|
|
|
that record all the magic. This is complicated by the need to
|
2004-05-13 08:41:07 +02:00
|
|
|
|
arrange for the FINALLY block to be executed on all exits. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static gimple_seq
|
|
|
|
|
lower_try_finally (struct leh_state *state, gimple tp)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct leh_tf_state this_tf;
|
|
|
|
|
struct leh_state this_state;
|
|
|
|
|
int ndests;
|
|
|
|
|
|
|
|
|
|
/* Process the try block. */
|
|
|
|
|
|
|
|
|
|
memset (&this_tf, 0, sizeof (this_tf));
|
2008-07-28 16:33:56 +02:00
|
|
|
|
this_tf.try_finally_expr = tp;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
this_tf.top_p = tp;
|
|
|
|
|
this_tf.outer = state;
|
|
|
|
|
if (using_eh_for_cleanups_p)
|
|
|
|
|
this_tf.region
|
|
|
|
|
= gen_eh_region_cleanup (state->cur_region, state->prev_try);
|
|
|
|
|
else
|
|
|
|
|
this_tf.region = NULL;
|
|
|
|
|
|
|
|
|
|
this_state.cur_region = this_tf.region;
|
|
|
|
|
this_state.prev_try = state->prev_try;
|
|
|
|
|
this_state.tf = &this_tf;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (&this_state, gimple_try_eval(tp));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Determine if the try block is escaped through the bottom. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
this_tf.may_fallthru = gimple_seq_may_fallthru (gimple_try_eval (tp));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* Determine if any exceptions are possible within the try block. */
|
|
|
|
|
if (using_eh_for_cleanups_p)
|
|
|
|
|
this_tf.may_throw = get_eh_region_may_contain_throw (this_tf.region);
|
|
|
|
|
if (this_tf.may_throw)
|
|
|
|
|
{
|
|
|
|
|
this_tf.eh_label = create_artificial_label ();
|
|
|
|
|
set_eh_region_tree_label (this_tf.region, this_tf.eh_label);
|
|
|
|
|
honor_protect_cleanup_actions (state, &this_state, &this_tf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Determine how many edges (still) reach the finally block. Or rather,
|
|
|
|
|
how many destinations are reached by the finally block. Use this to
|
|
|
|
|
determine how we process the finally block itself. */
|
|
|
|
|
|
2005-05-14 05:25:44 +02:00
|
|
|
|
ndests = VEC_length (tree, this_tf.dest_array);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
ndests += this_tf.may_fallthru;
|
|
|
|
|
ndests += this_tf.may_return;
|
|
|
|
|
ndests += this_tf.may_throw;
|
|
|
|
|
|
|
|
|
|
/* If the FINALLY block is not reachable, dike it out. */
|
|
|
|
|
if (ndests == 0)
|
2008-07-28 16:33:56 +02:00
|
|
|
|
{
|
|
|
|
|
gimple_seq_add_seq (&this_tf.top_p_seq, gimple_try_eval (tp));
|
|
|
|
|
gimple_try_set_cleanup (tp, NULL);
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* If the finally block doesn't fall through, then any destination
|
|
|
|
|
we might try to impose there isn't reached either. There may be
|
|
|
|
|
some minor amount of cleanup and redirection still needed. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
else if (!gimple_seq_may_fallthru (gimple_try_cleanup (tp)))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
lower_try_finally_nofallthru (state, &this_tf);
|
|
|
|
|
|
|
|
|
|
/* We can easily special-case redirection to a single destination. */
|
|
|
|
|
else if (ndests == 1)
|
|
|
|
|
lower_try_finally_onedest (state, &this_tf);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
else if (decide_copy_try_finally (ndests, gimple_try_cleanup (tp)))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
lower_try_finally_copy (state, &this_tf);
|
|
|
|
|
else
|
|
|
|
|
lower_try_finally_switch (state, &this_tf);
|
|
|
|
|
|
|
|
|
|
/* If someone requested we add a label at the end of the transformed
|
|
|
|
|
block, do so. */
|
|
|
|
|
if (this_tf.fallthru_label)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* This must be reached only if ndests == 0. */
|
|
|
|
|
gimple x = gimple_build_label (this_tf.fallthru_label);
|
|
|
|
|
gimple_seq_add_stmt (&this_tf.top_p_seq, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-14 05:25:44 +02:00
|
|
|
|
VEC_free (tree, heap, this_tf.dest_array);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (this_tf.goto_queue)
|
|
|
|
|
free (this_tf.goto_queue);
|
2007-08-14 20:12:34 +02:00
|
|
|
|
if (this_tf.goto_queue_map)
|
|
|
|
|
pointer_map_destroy (this_tf.goto_queue_map);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
return this_tf.top_p_seq;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* A subroutine of lower_eh_constructs_1. Lower a GIMPLE_TRY_CATCH with a
|
|
|
|
|
list of GIMPLE_CATCH to a sequence of labels and blocks, plus the
|
|
|
|
|
exception region trees that records all the magic. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static gimple_seq
|
|
|
|
|
lower_catch (struct leh_state *state, gimple tp)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct eh_region *try_region;
|
|
|
|
|
struct leh_state this_state;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_stmt_iterator gsi;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
tree out_label;
|
|
|
|
|
|
|
|
|
|
try_region = gen_eh_region_try (state->cur_region);
|
|
|
|
|
this_state.cur_region = try_region;
|
|
|
|
|
this_state.prev_try = try_region;
|
|
|
|
|
this_state.tf = state->tf;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (&this_state, gimple_try_eval (tp));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (!get_eh_region_may_contain_throw (try_region))
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return gimple_try_eval (tp);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out_label = NULL;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
for (gsi = gsi_start (gimple_try_cleanup (tp)); !gsi_end_p (gsi); )
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct eh_region *catch_region;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree eh_label;
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
gimple x, gcatch;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
gcatch = gsi_stmt (gsi);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
catch_region = gen_eh_region_catch (try_region,
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
gimple_catch_types (gcatch));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
this_state.cur_region = catch_region;
|
|
|
|
|
this_state.prev_try = state->prev_try;
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
lower_eh_constructs_1 (&this_state, gimple_catch_handler (gcatch));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
eh_label = create_artificial_label ();
|
|
|
|
|
set_eh_region_tree_label (catch_region, eh_label);
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_label (eh_label);
|
|
|
|
|
gsi_insert_before (&gsi, x, GSI_SAME_STMT);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
if (gimple_seq_may_fallthru (gimple_catch_handler (gcatch)))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
if (!out_label)
|
|
|
|
|
out_label = create_artificial_label ();
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_build_goto (out_label);
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
gimple_seq_add_stmt (gimple_catch_handler_ptr (gcatch), x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.
* calls.c (avoid_likely_spilled_reg): Likewise.
* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
* config/i386/i386.c (ix86_expand_special_args_builtin,
ix86_secondary_reload): Likewise.
* except.c (struct eh_region, gen_eh_region_catch,
remove_unreachable_regions, duplicate_eh_regions,
assign_filter_values, build_post_landing_pads,
sjlj_find_directly_reachable_regions, remove_eh_handler,
reachable_next_level, foreach_reachable_handler,
can_throw_internal_1, can_throw_external_1,
collect_one_action_chain): Likewise.
* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
* function.c (update_temp_slot_address, instantiate_new_reg,
instantiate_virtual_regs_in_rtx,
instantiate_virtual_regs_in_insn): Likewise.
* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
gimplify_cleanup_point_expr): Likewise.
* ipa-cp.c (ipcp_lattice_changed): Likewise.
* passes.c (next_pass_1): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* profile.c (branch_prob): Likewise.
* tree-dump.c (dump_register): Likewise.
* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
Likewise.
* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
copy_edges_for_bb, copy_cfg_body, copy_tree_r,
copy_arguments_for_versioning, copy_static_chain): Likewise.
* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
add_new_name_mapping, register_new_name_mapping): Likewise.
* tree-mudflap.c (mf_xform_derefs): Likewise.
* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
get_init_expr, combine_chains): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree-ssa-structalias.c (create_variable_info_for): Likewise.
* tree-vrp.c (simplify_cond_using_ranges): Likewise.
* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.
From-SVN: r138809
2008-08-06 17:57:09 +02:00
|
|
|
|
gsi_insert_seq_before (&gsi, gimple_catch_handler (gcatch),
|
2008-07-28 16:33:56 +02:00
|
|
|
|
GSI_SAME_STMT);
|
|
|
|
|
gsi_remove (&gsi, false);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return frob_into_branch_around (tp, NULL, out_label);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* A subroutine of lower_eh_constructs_1. Lower a GIMPLE_TRY with a
|
|
|
|
|
GIMPLE_EH_FILTER to a sequence of labels and blocks, plus the exception
|
2004-05-13 08:41:07 +02:00
|
|
|
|
region trees that record all the magic. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static gimple_seq
|
|
|
|
|
lower_eh_filter (struct leh_state *state, gimple tp)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct leh_state this_state;
|
|
|
|
|
struct eh_region *this_region;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple inner;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
tree eh_label;
|
2004-08-19 23:34:37 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
inner = gimple_seq_first_stmt (gimple_try_cleanup (tp));
|
|
|
|
|
|
|
|
|
|
if (gimple_eh_filter_must_not_throw (inner))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
this_region = gen_eh_region_must_not_throw (state->cur_region);
|
|
|
|
|
else
|
|
|
|
|
this_region = gen_eh_region_allowed (state->cur_region,
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_eh_filter_types (inner));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
this_state = *state;
|
|
|
|
|
this_state.cur_region = this_region;
|
2007-04-26 09:29:46 +02:00
|
|
|
|
/* For must not throw regions any cleanup regions inside it
|
|
|
|
|
can't reach outer catch regions. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (gimple_eh_filter_must_not_throw (inner))
|
2007-04-26 09:29:46 +02:00
|
|
|
|
this_state.prev_try = NULL;
|
2004-08-19 23:34:37 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (&this_state, gimple_try_eval (tp));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (!get_eh_region_may_contain_throw (this_region))
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return gimple_try_eval (tp);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (state, gimple_eh_filter_failure (inner));
|
|
|
|
|
gimple_try_set_cleanup (tp, gimple_eh_filter_failure (inner));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
eh_label = create_artificial_label ();
|
|
|
|
|
set_eh_region_tree_label (this_region, eh_label);
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return frob_into_branch_around (tp, eh_label, NULL);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implement a cleanup expression. This is similar to try-finally,
|
|
|
|
|
except that we only execute the cleanup block for exception edges. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static gimple_seq
|
|
|
|
|
lower_cleanup (struct leh_state *state, gimple tp)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
struct leh_state this_state;
|
|
|
|
|
struct eh_region *this_region;
|
|
|
|
|
struct leh_tf_state fake_tf;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq result;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
/* If not using eh, then exception-only cleanups are no-ops. */
|
|
|
|
|
if (!flag_exceptions)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
result = gimple_try_eval (tp);
|
|
|
|
|
lower_eh_constructs_1 (state, result);
|
|
|
|
|
return result;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this_region = gen_eh_region_cleanup (state->cur_region, state->prev_try);
|
|
|
|
|
this_state = *state;
|
|
|
|
|
this_state.cur_region = this_region;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (&this_state, gimple_try_eval (tp));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
if (!get_eh_region_may_contain_throw (this_region))
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return gimple_try_eval (tp);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Build enough of a try-finally state so that we can reuse
|
|
|
|
|
honor_protect_cleanup_actions. */
|
|
|
|
|
memset (&fake_tf, 0, sizeof (fake_tf));
|
|
|
|
|
fake_tf.top_p = tp;
|
|
|
|
|
fake_tf.outer = state;
|
|
|
|
|
fake_tf.region = this_region;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
fake_tf.may_fallthru = gimple_seq_may_fallthru (gimple_try_eval (tp));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
fake_tf.may_throw = true;
|
|
|
|
|
|
|
|
|
|
fake_tf.eh_label = create_artificial_label ();
|
|
|
|
|
set_eh_region_tree_label (this_region, fake_tf.eh_label);
|
|
|
|
|
|
|
|
|
|
honor_protect_cleanup_actions (state, NULL, &fake_tf);
|
|
|
|
|
|
|
|
|
|
if (fake_tf.may_throw)
|
|
|
|
|
{
|
|
|
|
|
/* In this case honor_protect_cleanup_actions had nothing to do,
|
|
|
|
|
and we should process this normally. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (state, gimple_try_cleanup (tp));
|
|
|
|
|
result = frob_into_branch_around (tp, fake_tf.eh_label,
|
|
|
|
|
fake_tf.fallthru_label);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* In this case honor_protect_cleanup_actions did nearly all of
|
|
|
|
|
the work. All we have left is to append the fallthru_label. */
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
result = gimple_try_eval (tp);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (fake_tf.fallthru_label)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple x = gimple_build_label (fake_tf.fallthru_label);
|
|
|
|
|
gimple_seq_add_stmt (&result, x);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
return result;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Main loop for lowering eh constructs. Also moves gsi to the next
|
|
|
|
|
statement. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_2 (struct leh_state *state, gimple_stmt_iterator *gsi)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq replace;
|
|
|
|
|
gimple x;
|
|
|
|
|
gimple stmt = gsi_stmt (*gsi);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
switch (gimple_code (stmt))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_CALL:
|
|
|
|
|
case GIMPLE_ASSIGN:
|
2009-03-31 12:23:44 +02:00
|
|
|
|
/* If the stmt can throw use a new temporary for the assignment
|
|
|
|
|
to a LHS. This makes sure the old value of the LHS is
|
|
|
|
|
available on the EH edge. */
|
|
|
|
|
if (stmt_could_throw_p (stmt)
|
|
|
|
|
&& gimple_has_lhs (stmt)
|
|
|
|
|
&& !tree_could_throw_p (gimple_get_lhs (stmt))
|
|
|
|
|
&& is_gimple_reg_type (TREE_TYPE (gimple_get_lhs (stmt))))
|
|
|
|
|
{
|
|
|
|
|
tree lhs = gimple_get_lhs (stmt);
|
|
|
|
|
tree tmp = create_tmp_var (TREE_TYPE (lhs), NULL);
|
|
|
|
|
gimple s = gimple_build_assign (lhs, tmp);
|
|
|
|
|
gimple_set_location (s, gimple_location (stmt));
|
|
|
|
|
gimple_set_block (s, gimple_block (stmt));
|
|
|
|
|
gimple_set_lhs (stmt, tmp);
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (tmp)) == COMPLEX_TYPE
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (tmp)) == VECTOR_TYPE)
|
|
|
|
|
DECL_GIMPLE_REG_P (tmp) = 1;
|
|
|
|
|
gsi_insert_after (gsi, s, GSI_SAME_STMT);
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* Look for things that can throw exceptions, and record them. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (state->cur_region && stmt_could_throw_p (stmt))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
record_stmt_eh_region (state->cur_region, stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
note_eh_region_may_contain_throw (state->cur_region);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_COND:
|
|
|
|
|
case GIMPLE_GOTO:
|
|
|
|
|
case GIMPLE_RETURN:
|
|
|
|
|
maybe_record_in_goto_queue (state, stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_SWITCH:
|
|
|
|
|
verify_norecord_switch_expr (state, stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_TRY:
|
|
|
|
|
if (gimple_try_kind (stmt) == GIMPLE_TRY_FINALLY)
|
|
|
|
|
replace = lower_try_finally (state, stmt);
|
|
|
|
|
else
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
x = gimple_seq_first_stmt (gimple_try_cleanup (stmt));
|
|
|
|
|
switch (gimple_code (x))
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_CATCH:
|
|
|
|
|
replace = lower_catch (state, stmt);
|
|
|
|
|
break;
|
|
|
|
|
case GIMPLE_EH_FILTER:
|
|
|
|
|
replace = lower_eh_filter (state, stmt);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
replace = lower_cleanup (state, stmt);
|
|
|
|
|
break;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Remove the old stmt and insert the transformed sequence
|
|
|
|
|
instead. */
|
|
|
|
|
gsi_insert_seq_before (gsi, replace, GSI_SAME_STMT);
|
|
|
|
|
gsi_remove (gsi, true);
|
|
|
|
|
|
|
|
|
|
/* Return since we don't want gsi_next () */
|
|
|
|
|
return;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
/* A type, a decl, or some kind of statement that we're not
|
|
|
|
|
interested in. Don't walk them. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
gsi_next (gsi);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A helper to unwrap a gimple_seq and feed stmts to lower_eh_constructs_2. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
lower_eh_constructs_1 (struct leh_state *state, gimple_seq seq)
|
|
|
|
|
{
|
|
|
|
|
gimple_stmt_iterator gsi;
|
|
|
|
|
for (gsi = gsi_start (seq); !gsi_end_p (gsi);)
|
|
|
|
|
lower_eh_constructs_2 (state, &gsi);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2006-03-02 20:00:11 +01:00
|
|
|
|
static unsigned int
|
2004-05-13 08:41:07 +02:00
|
|
|
|
lower_eh_constructs (void)
|
|
|
|
|
{
|
|
|
|
|
struct leh_state null_state;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
gimple_seq bodyp = gimple_body (current_function_decl);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
finally_tree = htab_create (31, struct_ptr_hash, struct_ptr_eq, free);
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
collect_finally_tree_1 (bodyp, NULL);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
memset (&null_state, 0, sizeof (null_state));
|
2008-07-28 16:33:56 +02:00
|
|
|
|
lower_eh_constructs_1 (&null_state, bodyp);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
htab_delete (finally_tree);
|
|
|
|
|
|
|
|
|
|
collect_eh_region_array ();
|
2006-03-02 20:00:11 +01:00
|
|
|
|
return 0;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
re PR other/35094 (RTL dump file letters hosed and partly undocumented)
* gcc.dg/20050811-2.c: Update dumping flags.
* gcc.dg/sms-2.c: Update dumping flags.
* gcc.dg/var-expand1.c: Update dumping flags.
* gcc.dg/var-expand3.c: Update dumping flags.
* gcc.dg/pr30957-1.c: Update dumping flags.
* gcc.dg/20050811-1.c: Update dumping flags.
* gcc.dg/cpp/cmdlne-dI-M.C: Do not xfail.
* gcc.dg/cpp/cmdlne-dM-M.C: Do not xfail.
PR other/35094
* toplev.c (decode_d_option): Handle all CPP flags.
* tree-vrp.c: Update tree_pass descriptors.
* regrename.c: Update tree_pass descriptors.
* fwprop.c: Update tree_pass descriptors.
* doc/invoke.texi: Remove documentation of dropped -d? flags.
* tree-into-ssa.c: Update tree_pass descriptors.
* tree-dump.c: Update tree_pass descriptors.
* tree-complex.c: Update tree_pass descriptors.
* tree-dump.h: Update tree_pass descriptors.
* see.c: Update tree_pass descriptors.
* cgraphbuild.c: Update tree_pass descriptors.
* tracer.c: Update tree_pass descriptors.
* tree-loop-distribution.c: Update tree_pass descriptors.
* cgraph.c: Update tree_pass descriptors.
* postreload-gcse.c: Update tree_pass descriptors.
* postreload.c: Update tree_pass descriptors.
* tree-ssa-loop-ch.c: Update tree_pass descriptors.
* tree-tailcall.c: Update tree_pass descriptors.
* tree-pass.h (tree_opt_pass): Rename to ...
(opt_pass) ... this one; add "type" field and remove letter field.
(gimple_opt_pass, rtl_opt_pass, simple_ipa_opt_pass): New.
(execute_pass_list, execute_ipa_pass_list, all_passes, all_ipa_passes,
all_lowering_passes): Update declaration.
* ipa-cp.c: Update tree_pass descriptors.
* final.c: Update tree_pass descriptors.
* omp-low.c: Update tree_pass descriptors.
* tree-ssa-dse.c: Update tree_pass descriptors.
* ipa-reference.c: Update tree_pass descriptors.
* tree-ssa-uncprop.c: Update tree_pass descriptors.
* auto-inc-dec.c: Update tree_pass descriptors.
* reorg.c: Update tree_pass descriptors.
* cgraphunit.c: Update tree_pass descriptors.
* tree-ssa-copyrename.c: Update tree_pass descriptors.
* tree-ssa-ccp.c: Update tree_pass descriptors.
* df-core.c: Update tree_pass descriptors.
* mode-switching.c: Update tree_pass descriptors.
* tree-nomudflap.c: Update tree_pass descriptors.
* modulo-sched.c: Update tree_pass descriptors.
* ipa-pure-const.c: Update tree_pass descriptors.
* cse.c: Update tree_pass descriptors.
* web.c: Update tree_pass descriptors.
* tree-stdarg.c: Update tree_pass descriptors.
* tree-ssa-math-opts.c: Update tree_pass descriptors.
* tree-ssa-dom.c: Update tree_pass descriptors.
* tree-nrv.c: Update tree_pass descriptors.
* tree-ssa-alias.c: Update tree_pass descriptors.
* loop-init.c: Update tree_pass descriptors.
* gimple-low.c: Update tree_pass descriptors.
* ipa-inline.c: Update tree_pass descriptors.
* tree-ssa-sink.c: Update tree_pass descriptors.
* global.c: Update tree_pass descriptors.
* ifcvt.c: Update tree_pass descriptors.
* jump.c: Update tree_pass descriptors.
* predict.c: Update tree_pass descriptors.
* tree-ssa-loop.c: Update tree_pass descriptors.
* recog.c: Update tree_pass descriptors.
* dse.c: Update tree_pass descriptors.
* tree-ssa-ifcombine.c: Update tree_pass descriptors.
* tree-eh.c: Update tree_pass descriptors.
* regmove.c: Update tree_pass descriptors.
* local-alloc.c
* function.c: Update tree_pass descriptors.
* tree-vectorizer.c: Update tree_pass descriptors.
* gcse.c: Update tree_pass descriptors.
* ipa-type-escape.c: Update tree_pass descriptors.
* tree-if-conv.c: Update tree_pass descriptors.
* init-regs.c: Update tree_pass descriptors.
* ipa.c: Update tree_pass descriptors.
* tree-ssa-phiopt.c: Update tree_pass descriptors.
* rtl-factoring.c: Update tree_pass descriptors.
* lower-subreg.c: Update tree_pass descriptors.
* bt-load.c: Update tree_pass descriptors.
* tree-dfa.c: Update tree_pass descriptors.
* except.c: Update tree_pass descriptors.
* emit-rtl.c: Update tree_pass descriptors.
* cfgexpand.c: Update tree_pass descriptors.
* tree-cfgcleanup.c: Update tree_pass descriptors.
* cfgcleanup.c: Update tree_pass descriptors.
* tree-ssa-pre.c: Update tree_pass descriptors.
* tree-sra.c: Update tree_pass descriptors.
* tree-mudflap.c: Update tree_pass descriptors.
* tree-ssa-copy.c: Update tree_pass descriptors.
* cfglayout.c: Update tree_pass descriptors.
* tree-ssa-forwprop.c: Update tree_pass descriptors.
* tree-ssa-dce.c: Update tree_pass descriptors.
* tree-ssa.c: Update tree_pass descriptors.
* regclass.c: Update tree_pass descriptors.
* integrate.c: Update tree_pass descriptors.
* tree-optimize.c: Update tree_pass descriptors.
* tree-ssa-phiprop.c: Update tree_pass descriptors.
* tree-object-size.c: Update tree_pass descriptors.
* combine.c: Update tree_pass descriptors.
* tree-outof-ssa.c: Update tree_pass descriptors.
* bb-reorder.c: Update tree_pass descriptors.
* stack-ptr-mod.c: Update tree_pass descriptors.
* var-tracking.c: Update tree_pass descriptors.
* tree-profile.c: Update tree_pass descriptors.
* tree-vect-generic.c: Update tree_pass descriptors.
* reg-stack.c: Update tree_pass descriptors.
* sched-rgn.c: Update tree_pass descriptors.
* tree-ssa-structalias.c: Update tree_pass descriptors.
* tree-cfg.c: Update tree_pass descriptors.
* passes.c (current_pass): Update declaration.
(finish_optimization_passes): Update.
(all_passes, all_ipa_passes, all_lowering_passes): Update declaration.
(register_one_dump_file, register_dump_files_1, next_pass_1):
Update arguments.
(init_optimization_passes): Update handling of new types.
(execute_one_pass, execute_pass_list, execute_ipa_pass_list): Update.
* ipa-struct-reorg.c: Update tree_pass descriptors.
* tree-ssa-reassoc.c: Update tree_pass descriptors.
* combine-stack-adj.c: Update tree_pass descriptors.
* cfgrtl.c: Update tree_pass descriptors.
* dce.c: Update tree_pass descriptors.
* tree-ssanames.c: Update tree_pass descriptors.
From-SVN: r133342
2008-03-19 12:22:40 +01:00
|
|
|
|
struct gimple_opt_pass pass_lower_eh =
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
re PR other/35094 (RTL dump file letters hosed and partly undocumented)
* gcc.dg/20050811-2.c: Update dumping flags.
* gcc.dg/sms-2.c: Update dumping flags.
* gcc.dg/var-expand1.c: Update dumping flags.
* gcc.dg/var-expand3.c: Update dumping flags.
* gcc.dg/pr30957-1.c: Update dumping flags.
* gcc.dg/20050811-1.c: Update dumping flags.
* gcc.dg/cpp/cmdlne-dI-M.C: Do not xfail.
* gcc.dg/cpp/cmdlne-dM-M.C: Do not xfail.
PR other/35094
* toplev.c (decode_d_option): Handle all CPP flags.
* tree-vrp.c: Update tree_pass descriptors.
* regrename.c: Update tree_pass descriptors.
* fwprop.c: Update tree_pass descriptors.
* doc/invoke.texi: Remove documentation of dropped -d? flags.
* tree-into-ssa.c: Update tree_pass descriptors.
* tree-dump.c: Update tree_pass descriptors.
* tree-complex.c: Update tree_pass descriptors.
* tree-dump.h: Update tree_pass descriptors.
* see.c: Update tree_pass descriptors.
* cgraphbuild.c: Update tree_pass descriptors.
* tracer.c: Update tree_pass descriptors.
* tree-loop-distribution.c: Update tree_pass descriptors.
* cgraph.c: Update tree_pass descriptors.
* postreload-gcse.c: Update tree_pass descriptors.
* postreload.c: Update tree_pass descriptors.
* tree-ssa-loop-ch.c: Update tree_pass descriptors.
* tree-tailcall.c: Update tree_pass descriptors.
* tree-pass.h (tree_opt_pass): Rename to ...
(opt_pass) ... this one; add "type" field and remove letter field.
(gimple_opt_pass, rtl_opt_pass, simple_ipa_opt_pass): New.
(execute_pass_list, execute_ipa_pass_list, all_passes, all_ipa_passes,
all_lowering_passes): Update declaration.
* ipa-cp.c: Update tree_pass descriptors.
* final.c: Update tree_pass descriptors.
* omp-low.c: Update tree_pass descriptors.
* tree-ssa-dse.c: Update tree_pass descriptors.
* ipa-reference.c: Update tree_pass descriptors.
* tree-ssa-uncprop.c: Update tree_pass descriptors.
* auto-inc-dec.c: Update tree_pass descriptors.
* reorg.c: Update tree_pass descriptors.
* cgraphunit.c: Update tree_pass descriptors.
* tree-ssa-copyrename.c: Update tree_pass descriptors.
* tree-ssa-ccp.c: Update tree_pass descriptors.
* df-core.c: Update tree_pass descriptors.
* mode-switching.c: Update tree_pass descriptors.
* tree-nomudflap.c: Update tree_pass descriptors.
* modulo-sched.c: Update tree_pass descriptors.
* ipa-pure-const.c: Update tree_pass descriptors.
* cse.c: Update tree_pass descriptors.
* web.c: Update tree_pass descriptors.
* tree-stdarg.c: Update tree_pass descriptors.
* tree-ssa-math-opts.c: Update tree_pass descriptors.
* tree-ssa-dom.c: Update tree_pass descriptors.
* tree-nrv.c: Update tree_pass descriptors.
* tree-ssa-alias.c: Update tree_pass descriptors.
* loop-init.c: Update tree_pass descriptors.
* gimple-low.c: Update tree_pass descriptors.
* ipa-inline.c: Update tree_pass descriptors.
* tree-ssa-sink.c: Update tree_pass descriptors.
* global.c: Update tree_pass descriptors.
* ifcvt.c: Update tree_pass descriptors.
* jump.c: Update tree_pass descriptors.
* predict.c: Update tree_pass descriptors.
* tree-ssa-loop.c: Update tree_pass descriptors.
* recog.c: Update tree_pass descriptors.
* dse.c: Update tree_pass descriptors.
* tree-ssa-ifcombine.c: Update tree_pass descriptors.
* tree-eh.c: Update tree_pass descriptors.
* regmove.c: Update tree_pass descriptors.
* local-alloc.c
* function.c: Update tree_pass descriptors.
* tree-vectorizer.c: Update tree_pass descriptors.
* gcse.c: Update tree_pass descriptors.
* ipa-type-escape.c: Update tree_pass descriptors.
* tree-if-conv.c: Update tree_pass descriptors.
* init-regs.c: Update tree_pass descriptors.
* ipa.c: Update tree_pass descriptors.
* tree-ssa-phiopt.c: Update tree_pass descriptors.
* rtl-factoring.c: Update tree_pass descriptors.
* lower-subreg.c: Update tree_pass descriptors.
* bt-load.c: Update tree_pass descriptors.
* tree-dfa.c: Update tree_pass descriptors.
* except.c: Update tree_pass descriptors.
* emit-rtl.c: Update tree_pass descriptors.
* cfgexpand.c: Update tree_pass descriptors.
* tree-cfgcleanup.c: Update tree_pass descriptors.
* cfgcleanup.c: Update tree_pass descriptors.
* tree-ssa-pre.c: Update tree_pass descriptors.
* tree-sra.c: Update tree_pass descriptors.
* tree-mudflap.c: Update tree_pass descriptors.
* tree-ssa-copy.c: Update tree_pass descriptors.
* cfglayout.c: Update tree_pass descriptors.
* tree-ssa-forwprop.c: Update tree_pass descriptors.
* tree-ssa-dce.c: Update tree_pass descriptors.
* tree-ssa.c: Update tree_pass descriptors.
* regclass.c: Update tree_pass descriptors.
* integrate.c: Update tree_pass descriptors.
* tree-optimize.c: Update tree_pass descriptors.
* tree-ssa-phiprop.c: Update tree_pass descriptors.
* tree-object-size.c: Update tree_pass descriptors.
* combine.c: Update tree_pass descriptors.
* tree-outof-ssa.c: Update tree_pass descriptors.
* bb-reorder.c: Update tree_pass descriptors.
* stack-ptr-mod.c: Update tree_pass descriptors.
* var-tracking.c: Update tree_pass descriptors.
* tree-profile.c: Update tree_pass descriptors.
* tree-vect-generic.c: Update tree_pass descriptors.
* reg-stack.c: Update tree_pass descriptors.
* sched-rgn.c: Update tree_pass descriptors.
* tree-ssa-structalias.c: Update tree_pass descriptors.
* tree-cfg.c: Update tree_pass descriptors.
* passes.c (current_pass): Update declaration.
(finish_optimization_passes): Update.
(all_passes, all_ipa_passes, all_lowering_passes): Update declaration.
(register_one_dump_file, register_dump_files_1, next_pass_1):
Update arguments.
(init_optimization_passes): Update handling of new types.
(execute_one_pass, execute_pass_list, execute_ipa_pass_list): Update.
* ipa-struct-reorg.c: Update tree_pass descriptors.
* tree-ssa-reassoc.c: Update tree_pass descriptors.
* combine-stack-adj.c: Update tree_pass descriptors.
* cfgrtl.c: Update tree_pass descriptors.
* dce.c: Update tree_pass descriptors.
* tree-ssanames.c: Update tree_pass descriptors.
From-SVN: r133342
2008-03-19 12:22:40 +01:00
|
|
|
|
{
|
|
|
|
|
GIMPLE_PASS,
|
2004-05-13 08:41:07 +02:00
|
|
|
|
"eh", /* name */
|
|
|
|
|
NULL, /* gate */
|
|
|
|
|
lower_eh_constructs, /* execute */
|
|
|
|
|
NULL, /* sub */
|
|
|
|
|
NULL, /* next */
|
|
|
|
|
0, /* static_pass_number */
|
|
|
|
|
TV_TREE_EH, /* tv_id */
|
|
|
|
|
PROP_gimple_lcf, /* properties_required */
|
|
|
|
|
PROP_gimple_leh, /* properties_provided */
|
2006-02-08 09:13:20 +01:00
|
|
|
|
0, /* properties_destroyed */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
0, /* todo_flags_start */
|
re PR other/35094 (RTL dump file letters hosed and partly undocumented)
* gcc.dg/20050811-2.c: Update dumping flags.
* gcc.dg/sms-2.c: Update dumping flags.
* gcc.dg/var-expand1.c: Update dumping flags.
* gcc.dg/var-expand3.c: Update dumping flags.
* gcc.dg/pr30957-1.c: Update dumping flags.
* gcc.dg/20050811-1.c: Update dumping flags.
* gcc.dg/cpp/cmdlne-dI-M.C: Do not xfail.
* gcc.dg/cpp/cmdlne-dM-M.C: Do not xfail.
PR other/35094
* toplev.c (decode_d_option): Handle all CPP flags.
* tree-vrp.c: Update tree_pass descriptors.
* regrename.c: Update tree_pass descriptors.
* fwprop.c: Update tree_pass descriptors.
* doc/invoke.texi: Remove documentation of dropped -d? flags.
* tree-into-ssa.c: Update tree_pass descriptors.
* tree-dump.c: Update tree_pass descriptors.
* tree-complex.c: Update tree_pass descriptors.
* tree-dump.h: Update tree_pass descriptors.
* see.c: Update tree_pass descriptors.
* cgraphbuild.c: Update tree_pass descriptors.
* tracer.c: Update tree_pass descriptors.
* tree-loop-distribution.c: Update tree_pass descriptors.
* cgraph.c: Update tree_pass descriptors.
* postreload-gcse.c: Update tree_pass descriptors.
* postreload.c: Update tree_pass descriptors.
* tree-ssa-loop-ch.c: Update tree_pass descriptors.
* tree-tailcall.c: Update tree_pass descriptors.
* tree-pass.h (tree_opt_pass): Rename to ...
(opt_pass) ... this one; add "type" field and remove letter field.
(gimple_opt_pass, rtl_opt_pass, simple_ipa_opt_pass): New.
(execute_pass_list, execute_ipa_pass_list, all_passes, all_ipa_passes,
all_lowering_passes): Update declaration.
* ipa-cp.c: Update tree_pass descriptors.
* final.c: Update tree_pass descriptors.
* omp-low.c: Update tree_pass descriptors.
* tree-ssa-dse.c: Update tree_pass descriptors.
* ipa-reference.c: Update tree_pass descriptors.
* tree-ssa-uncprop.c: Update tree_pass descriptors.
* auto-inc-dec.c: Update tree_pass descriptors.
* reorg.c: Update tree_pass descriptors.
* cgraphunit.c: Update tree_pass descriptors.
* tree-ssa-copyrename.c: Update tree_pass descriptors.
* tree-ssa-ccp.c: Update tree_pass descriptors.
* df-core.c: Update tree_pass descriptors.
* mode-switching.c: Update tree_pass descriptors.
* tree-nomudflap.c: Update tree_pass descriptors.
* modulo-sched.c: Update tree_pass descriptors.
* ipa-pure-const.c: Update tree_pass descriptors.
* cse.c: Update tree_pass descriptors.
* web.c: Update tree_pass descriptors.
* tree-stdarg.c: Update tree_pass descriptors.
* tree-ssa-math-opts.c: Update tree_pass descriptors.
* tree-ssa-dom.c: Update tree_pass descriptors.
* tree-nrv.c: Update tree_pass descriptors.
* tree-ssa-alias.c: Update tree_pass descriptors.
* loop-init.c: Update tree_pass descriptors.
* gimple-low.c: Update tree_pass descriptors.
* ipa-inline.c: Update tree_pass descriptors.
* tree-ssa-sink.c: Update tree_pass descriptors.
* global.c: Update tree_pass descriptors.
* ifcvt.c: Update tree_pass descriptors.
* jump.c: Update tree_pass descriptors.
* predict.c: Update tree_pass descriptors.
* tree-ssa-loop.c: Update tree_pass descriptors.
* recog.c: Update tree_pass descriptors.
* dse.c: Update tree_pass descriptors.
* tree-ssa-ifcombine.c: Update tree_pass descriptors.
* tree-eh.c: Update tree_pass descriptors.
* regmove.c: Update tree_pass descriptors.
* local-alloc.c
* function.c: Update tree_pass descriptors.
* tree-vectorizer.c: Update tree_pass descriptors.
* gcse.c: Update tree_pass descriptors.
* ipa-type-escape.c: Update tree_pass descriptors.
* tree-if-conv.c: Update tree_pass descriptors.
* init-regs.c: Update tree_pass descriptors.
* ipa.c: Update tree_pass descriptors.
* tree-ssa-phiopt.c: Update tree_pass descriptors.
* rtl-factoring.c: Update tree_pass descriptors.
* lower-subreg.c: Update tree_pass descriptors.
* bt-load.c: Update tree_pass descriptors.
* tree-dfa.c: Update tree_pass descriptors.
* except.c: Update tree_pass descriptors.
* emit-rtl.c: Update tree_pass descriptors.
* cfgexpand.c: Update tree_pass descriptors.
* tree-cfgcleanup.c: Update tree_pass descriptors.
* cfgcleanup.c: Update tree_pass descriptors.
* tree-ssa-pre.c: Update tree_pass descriptors.
* tree-sra.c: Update tree_pass descriptors.
* tree-mudflap.c: Update tree_pass descriptors.
* tree-ssa-copy.c: Update tree_pass descriptors.
* cfglayout.c: Update tree_pass descriptors.
* tree-ssa-forwprop.c: Update tree_pass descriptors.
* tree-ssa-dce.c: Update tree_pass descriptors.
* tree-ssa.c: Update tree_pass descriptors.
* regclass.c: Update tree_pass descriptors.
* integrate.c: Update tree_pass descriptors.
* tree-optimize.c: Update tree_pass descriptors.
* tree-ssa-phiprop.c: Update tree_pass descriptors.
* tree-object-size.c: Update tree_pass descriptors.
* combine.c: Update tree_pass descriptors.
* tree-outof-ssa.c: Update tree_pass descriptors.
* bb-reorder.c: Update tree_pass descriptors.
* stack-ptr-mod.c: Update tree_pass descriptors.
* var-tracking.c: Update tree_pass descriptors.
* tree-profile.c: Update tree_pass descriptors.
* tree-vect-generic.c: Update tree_pass descriptors.
* reg-stack.c: Update tree_pass descriptors.
* sched-rgn.c: Update tree_pass descriptors.
* tree-ssa-structalias.c: Update tree_pass descriptors.
* tree-cfg.c: Update tree_pass descriptors.
* passes.c (current_pass): Update declaration.
(finish_optimization_passes): Update.
(all_passes, all_ipa_passes, all_lowering_passes): Update declaration.
(register_one_dump_file, register_dump_files_1, next_pass_1):
Update arguments.
(init_optimization_passes): Update handling of new types.
(execute_one_pass, execute_pass_list, execute_ipa_pass_list): Update.
* ipa-struct-reorg.c: Update tree_pass descriptors.
* tree-ssa-reassoc.c: Update tree_pass descriptors.
* combine-stack-adj.c: Update tree_pass descriptors.
* cfgrtl.c: Update tree_pass descriptors.
* dce.c: Update tree_pass descriptors.
* tree-ssanames.c: Update tree_pass descriptors.
From-SVN: r133342
2008-03-19 12:22:40 +01:00
|
|
|
|
TODO_dump_func /* todo_flags_finish */
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Construct EH edges for STMT. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
make_eh_edge (struct eh_region *region, void *data)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple stmt;
|
|
|
|
|
tree lab;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
basic_block src, dst;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
stmt = (gimple) data;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
lab = get_eh_region_tree_label (region);
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
src = gimple_bb (stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
dst = label_to_block (lab);
|
|
|
|
|
|
|
|
|
|
make_edge (src, dst, EDGE_ABNORMAL | EDGE_EH);
|
|
|
|
|
}
|
2004-08-19 23:34:37 +02:00
|
|
|
|
|
2009-03-28 10:08:52 +01:00
|
|
|
|
/* See if STMT is call that might be inlined. */
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
inlinable_call_p (gimple stmt)
|
|
|
|
|
{
|
|
|
|
|
tree decl;
|
|
|
|
|
if (gimple_code (stmt) != GIMPLE_CALL)
|
|
|
|
|
return false;
|
|
|
|
|
if (cfun->after_inlining)
|
|
|
|
|
return false;
|
|
|
|
|
/* Indirect calls can be propagated to direct call
|
|
|
|
|
and inlined. */
|
|
|
|
|
decl = gimple_call_fndecl (stmt);
|
|
|
|
|
if (!decl)
|
|
|
|
|
return true;
|
|
|
|
|
if (cgraph_function_flags_ready
|
|
|
|
|
&& cgraph_function_body_availability (cgraph_node (decl))
|
|
|
|
|
< AVAIL_OVERWRITABLE)
|
|
|
|
|
return false;
|
|
|
|
|
return !DECL_UNINLINABLE (decl);
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
make_eh_edges (gimple stmt)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
|
|
|
|
int region_nr;
|
|
|
|
|
bool is_resx;
|
2009-03-28 10:08:52 +01:00
|
|
|
|
bool inlinable = false;
|
2009-03-31 00:35:22 +02:00
|
|
|
|
basic_block bb;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (gimple_code (stmt) == GIMPLE_RESX)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
region_nr = gimple_resx_region (stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
is_resx = true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
region_nr = lookup_stmt_eh_region (stmt);
|
|
|
|
|
if (region_nr < 0)
|
|
|
|
|
return;
|
|
|
|
|
is_resx = false;
|
2009-03-28 10:08:52 +01:00
|
|
|
|
inlinable = inlinable_call_p (stmt);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-03-28 10:08:52 +01:00
|
|
|
|
foreach_reachable_handler (region_nr, is_resx, inlinable, make_eh_edge, stmt);
|
2009-03-31 00:35:22 +02:00
|
|
|
|
|
|
|
|
|
/* Make CFG profile more consistent assuming that exception will resume to first
|
|
|
|
|
available EH handler. In practice this makes little difference, but we get
|
|
|
|
|
fewer consistency errors in the dumps. */
|
|
|
|
|
bb = gimple_bb (stmt);
|
|
|
|
|
if (is_resx && EDGE_COUNT (bb->succs))
|
|
|
|
|
EDGE_SUCC (bb, 0)->probability = REG_BR_PROB_BASE;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2005-04-25 19:24:28 +02:00
|
|
|
|
static bool mark_eh_edge_found_error;
|
|
|
|
|
|
|
|
|
|
/* Mark edge make_eh_edge would create for given region by setting it aux
|
|
|
|
|
field, output error if something goes wrong. */
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2005-04-25 19:24:28 +02:00
|
|
|
|
static void
|
|
|
|
|
mark_eh_edge (struct eh_region *region, void *data)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple stmt;
|
|
|
|
|
tree lab;
|
2005-04-25 19:24:28 +02:00
|
|
|
|
basic_block src, dst;
|
|
|
|
|
edge e;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
stmt = (gimple) data;
|
2005-04-25 19:24:28 +02:00
|
|
|
|
lab = get_eh_region_tree_label (region);
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
src = gimple_bb (stmt);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
dst = label_to_block (lab);
|
|
|
|
|
|
|
|
|
|
e = find_edge (src, dst);
|
|
|
|
|
if (!e)
|
|
|
|
|
{
|
bb-reorder.c, [...]: Avoid "." or "\n" at end of diagnostics and capital letters at start of diagnostics.
* bb-reorder.c, c-pch.c, c-pragma.c, c.opt, cfghooks.c, cfgloop.c,
cfgrtl.c, cgraphunit.c, config/c4x/c4x.c, config/cris/cris.c,
config/frv/frv.c, config/host-darwin.c, config/iq2000/iq2000.c,
config/lynx.h, config/m68k/m68k.c, config/pa/pa.c, config/sh/sh.h,
config/stormy16/stormy16.c, config/v850/v850.c,
config/vax/netbsd-elf.h, coverage.c, dwarf2out.c, emit-rtl.c,
except.c, gcc.c, tree-cfg.c, tree-eh.c, tree-ssa.c, xcoffout.c:
Avoid "." or "\n" at end of diagnostics and capital letters at
start of diagnostics.
* combine.c, cse.c: Don't translate dump file output.
* toplev.c (print_version): Only translate output if going to
stderr.
From-SVN: r101561
2005-07-03 23:08:11 +02:00
|
|
|
|
error ("EH edge %i->%i is missing", src->index, dst->index);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
mark_eh_edge_found_error = true;
|
|
|
|
|
}
|
|
|
|
|
else if (!(e->flags & EDGE_EH))
|
|
|
|
|
{
|
bb-reorder.c, [...]: Avoid "." or "\n" at end of diagnostics and capital letters at start of diagnostics.
* bb-reorder.c, c-pch.c, c-pragma.c, c.opt, cfghooks.c, cfgloop.c,
cfgrtl.c, cgraphunit.c, config/c4x/c4x.c, config/cris/cris.c,
config/frv/frv.c, config/host-darwin.c, config/iq2000/iq2000.c,
config/lynx.h, config/m68k/m68k.c, config/pa/pa.c, config/sh/sh.h,
config/stormy16/stormy16.c, config/v850/v850.c,
config/vax/netbsd-elf.h, coverage.c, dwarf2out.c, emit-rtl.c,
except.c, gcc.c, tree-cfg.c, tree-eh.c, tree-ssa.c, xcoffout.c:
Avoid "." or "\n" at end of diagnostics and capital letters at
start of diagnostics.
* combine.c, cse.c: Don't translate dump file output.
* toplev.c (print_version): Only translate output if going to
stderr.
From-SVN: r101561
2005-07-03 23:08:11 +02:00
|
|
|
|
error ("EH edge %i->%i miss EH flag", src->index, dst->index);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
mark_eh_edge_found_error = true;
|
|
|
|
|
}
|
|
|
|
|
else if (e->aux)
|
|
|
|
|
{
|
|
|
|
|
/* ??? might not be mistake. */
|
bb-reorder.c, [...]: Avoid "." or "\n" at end of diagnostics and capital letters at start of diagnostics.
* bb-reorder.c, c-pch.c, c-pragma.c, c.opt, cfghooks.c, cfgloop.c,
cfgrtl.c, cgraphunit.c, config/c4x/c4x.c, config/cris/cris.c,
config/frv/frv.c, config/host-darwin.c, config/iq2000/iq2000.c,
config/lynx.h, config/m68k/m68k.c, config/pa/pa.c, config/sh/sh.h,
config/stormy16/stormy16.c, config/v850/v850.c,
config/vax/netbsd-elf.h, coverage.c, dwarf2out.c, emit-rtl.c,
except.c, gcc.c, tree-cfg.c, tree-eh.c, tree-ssa.c, xcoffout.c:
Avoid "." or "\n" at end of diagnostics and capital letters at
start of diagnostics.
* combine.c, cse.c: Don't translate dump file output.
* toplev.c (print_version): Only translate output if going to
stderr.
From-SVN: r101561
2005-07-03 23:08:11 +02:00
|
|
|
|
error ("EH edge %i->%i has duplicated regions", src->index, dst->index);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
mark_eh_edge_found_error = true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
e->aux = (void *)1;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Verify that BB containing STMT as the last statement, has precisely the
|
|
|
|
|
edges that make_eh_edges would create. */
|
|
|
|
|
|
2005-04-25 19:24:28 +02:00
|
|
|
|
bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
verify_eh_edges (gimple stmt)
|
2005-04-25 19:24:28 +02:00
|
|
|
|
{
|
|
|
|
|
int region_nr;
|
|
|
|
|
bool is_resx;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
basic_block bb = gimple_bb (stmt);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
edge_iterator ei;
|
|
|
|
|
edge e;
|
2009-03-28 10:08:52 +01:00
|
|
|
|
bool inlinable = false;
|
2005-04-25 19:24:28 +02:00
|
|
|
|
|
|
|
|
|
FOR_EACH_EDGE (e, ei, bb->succs)
|
|
|
|
|
gcc_assert (!e->aux);
|
|
|
|
|
mark_eh_edge_found_error = false;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (gimple_code (stmt) == GIMPLE_RESX)
|
2005-04-25 19:24:28 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
region_nr = gimple_resx_region (stmt);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
is_resx = true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
region_nr = lookup_stmt_eh_region (stmt);
|
|
|
|
|
if (region_nr < 0)
|
|
|
|
|
{
|
|
|
|
|
FOR_EACH_EDGE (e, ei, bb->succs)
|
|
|
|
|
if (e->flags & EDGE_EH)
|
|
|
|
|
{
|
|
|
|
|
error ("BB %i can not throw but has EH edges", bb->index);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (!stmt_could_throw_p (stmt))
|
2005-04-25 19:24:28 +02:00
|
|
|
|
{
|
|
|
|
|
error ("BB %i last statement has incorrectly set region", bb->index);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2009-03-28 10:08:52 +01:00
|
|
|
|
inlinable = inlinable_call_p (stmt);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
is_resx = false;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-28 10:08:52 +01:00
|
|
|
|
foreach_reachable_handler (region_nr, is_resx, inlinable, mark_eh_edge, stmt);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
FOR_EACH_EDGE (e, ei, bb->succs)
|
|
|
|
|
{
|
|
|
|
|
if ((e->flags & EDGE_EH) && !e->aux)
|
|
|
|
|
{
|
bb-reorder.c, [...]: Avoid "." or "\n" at end of diagnostics and capital letters at start of diagnostics.
* bb-reorder.c, c-pch.c, c-pragma.c, c.opt, cfghooks.c, cfgloop.c,
cfgrtl.c, cgraphunit.c, config/c4x/c4x.c, config/cris/cris.c,
config/frv/frv.c, config/host-darwin.c, config/iq2000/iq2000.c,
config/lynx.h, config/m68k/m68k.c, config/pa/pa.c, config/sh/sh.h,
config/stormy16/stormy16.c, config/v850/v850.c,
config/vax/netbsd-elf.h, coverage.c, dwarf2out.c, emit-rtl.c,
except.c, gcc.c, tree-cfg.c, tree-eh.c, tree-ssa.c, xcoffout.c:
Avoid "." or "\n" at end of diagnostics and capital letters at
start of diagnostics.
* combine.c, cse.c: Don't translate dump file output.
* toplev.c (print_version): Only translate output if going to
stderr.
From-SVN: r101561
2005-07-03 23:08:11 +02:00
|
|
|
|
error ("unnecessary EH edge %i->%i", bb->index, e->dest->index);
|
2005-04-25 19:24:28 +02:00
|
|
|
|
mark_eh_edge_found_error = true;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
e->aux = NULL;
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2005-04-25 19:24:28 +02:00
|
|
|
|
return mark_eh_edge_found_error;
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Helper function for operation_could_trap_p and stmt_could_throw_p. */
|
|
|
|
|
|
2009-01-18 16:51:12 +01:00
|
|
|
|
bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
operation_could_trap_helper_p (enum tree_code op,
|
|
|
|
|
bool fp_operation,
|
|
|
|
|
bool honor_trapv,
|
|
|
|
|
bool honor_nans,
|
|
|
|
|
bool honor_snans,
|
|
|
|
|
tree divisor,
|
|
|
|
|
bool *handled)
|
|
|
|
|
{
|
|
|
|
|
*handled = true;
|
|
|
|
|
switch (op)
|
|
|
|
|
{
|
|
|
|
|
case TRUNC_DIV_EXPR:
|
|
|
|
|
case CEIL_DIV_EXPR:
|
|
|
|
|
case FLOOR_DIV_EXPR:
|
|
|
|
|
case ROUND_DIV_EXPR:
|
|
|
|
|
case EXACT_DIV_EXPR:
|
|
|
|
|
case CEIL_MOD_EXPR:
|
|
|
|
|
case FLOOR_MOD_EXPR:
|
|
|
|
|
case ROUND_MOD_EXPR:
|
|
|
|
|
case TRUNC_MOD_EXPR:
|
|
|
|
|
case RDIV_EXPR:
|
|
|
|
|
if (honor_snans || honor_trapv)
|
|
|
|
|
return true;
|
|
|
|
|
if (fp_operation)
|
|
|
|
|
return flag_trapping_math;
|
|
|
|
|
if (!TREE_CONSTANT (divisor) || integer_zerop (divisor))
|
|
|
|
|
return true;
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
case LT_EXPR:
|
|
|
|
|
case LE_EXPR:
|
|
|
|
|
case GT_EXPR:
|
|
|
|
|
case GE_EXPR:
|
|
|
|
|
case LTGT_EXPR:
|
|
|
|
|
/* Some floating point comparisons may trap. */
|
|
|
|
|
return honor_nans;
|
|
|
|
|
|
|
|
|
|
case EQ_EXPR:
|
|
|
|
|
case NE_EXPR:
|
|
|
|
|
case UNORDERED_EXPR:
|
|
|
|
|
case ORDERED_EXPR:
|
|
|
|
|
case UNLT_EXPR:
|
|
|
|
|
case UNLE_EXPR:
|
|
|
|
|
case UNGT_EXPR:
|
|
|
|
|
case UNGE_EXPR:
|
|
|
|
|
case UNEQ_EXPR:
|
|
|
|
|
return honor_snans;
|
|
|
|
|
|
|
|
|
|
case CONVERT_EXPR:
|
|
|
|
|
case FIX_TRUNC_EXPR:
|
|
|
|
|
/* Conversion of floating point might trap. */
|
|
|
|
|
return honor_nans;
|
|
|
|
|
|
|
|
|
|
case NEGATE_EXPR:
|
|
|
|
|
case ABS_EXPR:
|
|
|
|
|
case CONJ_EXPR:
|
|
|
|
|
/* These operations don't trap with floating point. */
|
|
|
|
|
if (honor_trapv)
|
|
|
|
|
return true;
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
case PLUS_EXPR:
|
|
|
|
|
case MINUS_EXPR:
|
|
|
|
|
case MULT_EXPR:
|
|
|
|
|
/* Any floating arithmetic may trap. */
|
|
|
|
|
if (fp_operation && flag_trapping_math)
|
|
|
|
|
return true;
|
|
|
|
|
if (honor_trapv)
|
|
|
|
|
return true;
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
/* Any floating arithmetic may trap. */
|
|
|
|
|
if (fp_operation && flag_trapping_math)
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
*handled = false;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return true if operation OP may trap. FP_OPERATION is true if OP is applied
|
|
|
|
|
on floating-point values. HONOR_TRAPV is true if OP is applied on integer
|
|
|
|
|
type operands that may trap. If OP is a division operator, DIVISOR contains
|
|
|
|
|
the value of the divisor. */
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
operation_could_trap_p (enum tree_code op, bool fp_operation, bool honor_trapv,
|
|
|
|
|
tree divisor)
|
|
|
|
|
{
|
|
|
|
|
bool honor_nans = (fp_operation && flag_trapping_math
|
|
|
|
|
&& !flag_finite_math_only);
|
|
|
|
|
bool honor_snans = fp_operation && flag_signaling_nans != 0;
|
|
|
|
|
bool handled;
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE_CLASS (op) != tcc_comparison
|
|
|
|
|
&& TREE_CODE_CLASS (op) != tcc_unary
|
|
|
|
|
&& TREE_CODE_CLASS (op) != tcc_binary)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
return operation_could_trap_helper_p (op, fp_operation, honor_trapv,
|
|
|
|
|
honor_nans, honor_snans, divisor,
|
|
|
|
|
&handled);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return true if EXPR can trap, as in dereferencing an invalid pointer
|
2004-06-29 08:59:35 +02:00
|
|
|
|
location or floating point arithmetic. C.f. the rtl version, may_trap_p.
|
|
|
|
|
This routine expects only GIMPLE lhs or rhs input. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
tree_could_trap_p (tree expr)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
enum tree_code code;
|
2004-06-29 08:59:35 +02:00
|
|
|
|
bool fp_operation = false;
|
2004-07-11 20:14:48 +02:00
|
|
|
|
bool honor_trapv = false;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
tree t, base, div = NULL_TREE;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (!expr)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
code = TREE_CODE (expr);
|
|
|
|
|
t = TREE_TYPE (expr);
|
|
|
|
|
|
|
|
|
|
if (t)
|
2004-06-29 08:59:35 +02:00
|
|
|
|
{
|
2008-05-09 00:16:59 +02:00
|
|
|
|
if (COMPARISON_CLASS_P (expr))
|
|
|
|
|
fp_operation = FLOAT_TYPE_P (TREE_TYPE (TREE_OPERAND (expr, 0)));
|
|
|
|
|
else
|
|
|
|
|
fp_operation = FLOAT_TYPE_P (t);
|
2008-07-28 16:33:56 +02:00
|
|
|
|
honor_trapv = INTEGRAL_TYPE_P (t) && TYPE_OVERFLOW_TRAPS (t);
|
2004-06-29 08:59:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (TREE_CODE_CLASS (code) == tcc_binary)
|
|
|
|
|
div = TREE_OPERAND (expr, 1);
|
|
|
|
|
if (operation_could_trap_p (code, fp_operation, honor_trapv, div))
|
|
|
|
|
return true;
|
|
|
|
|
|
2004-07-16 23:13:08 +02:00
|
|
|
|
restart:
|
2004-05-13 08:41:07 +02:00
|
|
|
|
switch (code)
|
|
|
|
|
{
|
tree-ssa-address.c: New file.
* tree-ssa-address.c: New file.
* Makefile.in (tree-ssa-address.o): Add.
* expr.c (expand_expr_real_1): Do not handle REF_ORIGINAL on
INDIRECT_REFs. Handle TARGET_MEM_REFs.
* tree-eh.c (tree_could_trap_p): Handle TARGET_MEM_REFs.
* tree-flow.h (struct mem_address): New.
(struct affine_tree_combination): Moved from tree-ssa-loop-ivopts.c.
(create_mem_ref, addr_for_mem_ref, get_address_description,
maybe_fold_tmr, multiplier_allowed_in_address_p,
multiply_by_cost): Declare.
* tree-mudflap.c (mf_xform_derefs_1): Handle TARGET_MEM_REFs.
* tree-pretty-print.c (dump_generic_node): Ditto.
* tree-ssa-loop-im.c (for_each_index): Ditto.
* tree-ssa-loop-ivopts.c (may_be_unaligned_p,
find_interesting_uses_address): Ditto.
(rewrite_address_base, build_addr_strip_iref): Removed.
(struct affine_tree_combination): Moved to tree-flow.h.
(get_ref_tag, copy_ref_info): New functions.
(rewrite_use_address): Produce TARGET_MEM_REFs.
(tree_ssa_iv_optimize): Do not call update_ssa
and rewrite_into_loop_closed_ssa.
(tree_to_aff_combination): Use build_fold_addr_expr instead of
build_addr_strip_iref.
(unshare_aff_combination): New function.
(fold_affine_sum): Removed.
(get_computation_at): Use get_computation_aff. Unshare the result.
(get_computation_aff, multiplier_allowed_in_address_p): New function.
(multiply_by_cost): Exported.
(get_address_cost): Use multiplier_allowed_in_address_p.
* tree-ssa-operands.c (get_tmr_operands): New function.
(get_expr_operands): Handle TARGET_MEM_REFs.
* tree.c (copy_node_stat): Copy annotations for TARGET_MEM_REFs.
(build): Handle 7 arguments.
(build7_stat): New function.
* tree.def (TARGET_MEM_DEF): New.
* tree.h (REF_ORIGINAL): Removed.
(TMR_SYMBOL, TMR_BASE, TMR_INDEX, TMR_STEP, TMR_OFFSET, TMR_ORIGINAL,
TMR_TAG, build7): New macros.
(build7_stat, tree_mem_ref_addr, copy_mem_ref_info): Declare.
* tree-ssa-ccp.c (fold_stmt_r): Call maybe_fold_tmr.
* doc/c-tree.texi: Document TARGET_MEM_REF.
* doc/tree-ssa.texi: Add TARGET_MEM_REF to gimple grammar.
* gcc.dg/tree-ssa/loop-2.c: Update outcome.
* gcc.dg/tree-ssa/loop-3.c: Update outcome.
* gcc.dg/tree-ssa/loop-4.c: Update outcome.
* gcc.dg/tree-ssa/loop-9.c: New test.
From-SVN: r100708
2005-06-07 14:01:47 +02:00
|
|
|
|
case TARGET_MEM_REF:
|
|
|
|
|
/* For TARGET_MEM_REFs use the information based on the original
|
|
|
|
|
reference. */
|
|
|
|
|
expr = TMR_ORIGINAL (expr);
|
|
|
|
|
code = TREE_CODE (expr);
|
|
|
|
|
goto restart;
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
case COMPONENT_REF:
|
|
|
|
|
case REALPART_EXPR:
|
|
|
|
|
case IMAGPART_EXPR:
|
|
|
|
|
case BIT_FIELD_REF:
|
2007-02-18 15:03:24 +01:00
|
|
|
|
case VIEW_CONVERT_EXPR:
|
2004-07-16 23:13:08 +02:00
|
|
|
|
case WITH_SIZE_EXPR:
|
|
|
|
|
expr = TREE_OPERAND (expr, 0);
|
|
|
|
|
code = TREE_CODE (expr);
|
|
|
|
|
goto restart;
|
2004-07-10 06:57:58 +02:00
|
|
|
|
|
|
|
|
|
case ARRAY_RANGE_REF:
|
2006-07-03 22:14:18 +02:00
|
|
|
|
base = TREE_OPERAND (expr, 0);
|
|
|
|
|
if (tree_could_trap_p (base))
|
2004-07-10 06:57:58 +02:00
|
|
|
|
return true;
|
|
|
|
|
|
2006-07-03 22:14:18 +02:00
|
|
|
|
if (TREE_THIS_NOTRAP (expr))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
return !range_in_array_bounds_p (expr);
|
2004-07-10 06:57:58 +02:00
|
|
|
|
|
|
|
|
|
case ARRAY_REF:
|
|
|
|
|
base = TREE_OPERAND (expr, 0);
|
|
|
|
|
if (tree_could_trap_p (base))
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
if (TREE_THIS_NOTRAP (expr))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
return !in_array_bounds_p (expr);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
case INDIRECT_REF:
|
tree.def (ALIGN_INDIRECT_REF, [...]): New tree-codes.
2004-09-23 Dorit Naishlos <dorit@il.ibm.com>
* tree.def (ALIGN_INDIRECT_REF, MISALIGNED_INDIRECT_REF):
New tree-codes.
* tree.h (REF_ORIGINAL): Consider ALIGN_INDIRECT_REF and
MISALIGNED_INDIRECT_REF.
* alias.c (get_alias_set, nonoverlapping_memrefs_p): Likewise.
* emit-rtl.c (mem_expr_equal_p, set_mem_attributes_minus_bitpos):
Likewise.
* expr.c (safe_from_p, expand_expr_real_1, rewrite_address_base)
(find_interesting_uses_address): Likewise.
* fold-const.c (non_lvalue, operand_equal_p): Likewise.
(build_fold_addr_expr_with_type): Likewise.
* gimplify.c (gimplify_addr_expr, gimplify_expr): Likewise.
* print-rtl.c (print_mem_expr): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-eh.c (tree_could_trap_p): Likewise.
* tree-gimple.c (is_gimple_addressable, get_base_address): Likewise.
* tree-pretty-print.c (op_prio, op_symbol, dump_generic_node): Likewise.
* tree-ssa-alias.c (find_ptr_dereference, ptr_is_dereferenced_by):
Likewise.
* tree-ssa-dce.c (mark_stmt_if_obviously_necessary): Likewise.
* tree-ssa-dom.c (record_equivalences_from_stmt): Likewise.
* tree-ssa-loop-im.c (for_each_index, is_call_clobbered_ref): Likewise.
* tree-ssa-loop-ivopts.c (find_interesting_uses_address): Likewise.
(add_address_candidates, rewrite_address_base): Likewise.
* tree-ssa-operands.c (get_expr_operands, get_indirect_ref_operands):
Likewise.
* tree.c (staticp, build1_stat): Likewise.
* tree.def (REALIGN_LOAD_EXPR, REALIGN_STORE_EXPR): New tree-codes.
* tree-pretty-print.c (dump_generic_node): Consider REALIGN_LOAD_EXPR.
* tree-ssa-operands.c (get_expr_operands): Likewise.
* expr.c (expand_expr_real_1): Likewise.
* optabs.h (vec_realign_store_optab, vec_realign_load_optab): New
optabs.
(OTI_vec_realign_store, OTI_vec_realign_load): New optab_index values
for the new optabs.
(expand_ternary_op): New function.
* genopinit.c (optabs): Handle the new optabs.
* optabs.c (optab_for_tree_code): Add cases for the new tree-codes.
(init_optabs): Initialize vec_realign_load_optab.
(expand_ternary_op): New functions.
* target-def.h (TARGET_VECTORIZE): New member for struct gcc_target.
(TARGET_VECTORIZE_MISALIGNED_MEM_OK): New member for targetm.vectorize.
(TARGET_VECTORIZE_BUILTIN_MASK_FOR_LOAD): Likewise.
(TARGET_VECTORIZE_BUILTIN_MASK_FOR_STORE): Likewise.
* target.h (struct vectorize): New member for struct gcc_target.
(misaligned_mem_ok): New member for targetm.vectorize.
(builtin_mask_for_load): Likewise.
(builtin_mask_for_store): Likewise.
* targethooks.c (default_vect_misaligned_mem_ok): New function.
* targethooks.h (default_vect_misaligned_mem_ok): New function.
* config/rs6000/altivec.md (build_vector_mask_for_load): New
define_expand.
(vec_realign_load_v4si, vec_realign_load_v4sf, vec_realign_load_v8hi)
(vec_realign_load_v16qi): New define_insn.
* config/rs6000/rs6000.h (ALTIVEC_BUILTIN_MASK_FOR_LOAD):
(ALTIVEC_BUILTIN_MASK_FOR_STORE): New target builtins.
* config/rs6000/rs6000.c (altivec_builtin_mask_for_load):
(altivec_builtin_mask_for_store): New variables.
(rs6000_builtin_mask_for_load): New function. Implements
TARGET_VECTORIZE_BUILTIN_MASK_FOR_LOAD.
(rs6000_builtin_mask_for_store): New function. Implements
TARGET_VECTORIZE_BUILTIN_MASK_FOR_STORE.
(rs6000_expand_builtin): Expand the target builtins
builtin_mask_for_load and builtin_mask_for_store.
(altivec_init_builtins): Initialize the new target builtins.
* config/i386/i386.c (ix86_misaligned_mem_ok): New function.
Implements the target hook TARGET_VECTORIZE_MISALIGNED_MEM_OK.
* tree-vectorizer.c (vect_create_data_ref): Renamed to
vect_create_data_ref_ptr. Returns a pointer instead of an array-ref.
(vect_create_addr_base_for_vector_ref): Additional argument (offset).
(vectorizable_store): Call vect_create_data_ref_ptr with additional
arguments, and create an indirect_ref with its return value data_ref.
Check aligned_access_p.
(vectorizable_load): Handle misaligned loads, using software-pipelined
scheme with REALIGN_LOAD_EXPR and ALIGN_INDIRECT_REF if
vec_realign_load_optab is supported, or using a scheme without
software-pipelining with MISALIGNED_INDIRECT_REF if the target hook
misaligned_mem_ok is supported.
(vect_finish_stmt_generation): Typo.
(vect_enhance_data_refs_alignment): Rename loop_vinfo to loop_info.
(vect_analyze_data_refs_alignment): Don't fail vectorization in the
presence of misaligned loads.
(vect_analyze_data_ref_access): Add check for constant init.
(vect_get_symbl_and_dr): Remove duplicate line.
* tree-vectorizer.h (DR_MISALIGNMENT): Add comment.
From-SVN: r87948
2004-09-23 16:34:35 +02:00
|
|
|
|
case ALIGN_INDIRECT_REF:
|
|
|
|
|
case MISALIGNED_INDIRECT_REF:
|
2004-06-29 08:59:35 +02:00
|
|
|
|
return !TREE_THIS_NOTRAP (expr);
|
|
|
|
|
|
|
|
|
|
case ASM_EXPR:
|
|
|
|
|
return TREE_THIS_VOLATILE (expr);
|
2004-06-26 12:10:25 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
case CALL_EXPR:
|
|
|
|
|
t = get_callee_fndecl (expr);
|
|
|
|
|
/* Assume that calls to weak functions may trap. */
|
|
|
|
|
if (!t || !DECL_P (t) || DECL_WEAK (t))
|
2004-06-29 08:59:35 +02:00
|
|
|
|
return true;
|
|
|
|
|
return false;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-06-29 08:59:35 +02:00
|
|
|
|
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Helper for stmt_could_throw_p. Return true if STMT (assumed to be a
|
|
|
|
|
an assignment or a conditional) may throw. */
|
2004-06-29 08:59:35 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
static bool
|
|
|
|
|
stmt_could_throw_1_p (gimple stmt)
|
|
|
|
|
{
|
|
|
|
|
enum tree_code code = gimple_expr_code (stmt);
|
|
|
|
|
bool honor_nans = false;
|
|
|
|
|
bool honor_snans = false;
|
|
|
|
|
bool fp_operation = false;
|
|
|
|
|
bool honor_trapv = false;
|
|
|
|
|
tree t;
|
|
|
|
|
size_t i;
|
|
|
|
|
bool handled, ret;
|
2004-07-11 20:14:48 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (TREE_CODE_CLASS (code) == tcc_comparison
|
|
|
|
|
|| TREE_CODE_CLASS (code) == tcc_unary
|
|
|
|
|
|| TREE_CODE_CLASS (code) == tcc_binary)
|
|
|
|
|
{
|
|
|
|
|
t = gimple_expr_type (stmt);
|
|
|
|
|
fp_operation = FLOAT_TYPE_P (t);
|
|
|
|
|
if (fp_operation)
|
|
|
|
|
{
|
|
|
|
|
honor_nans = flag_trapping_math && !flag_finite_math_only;
|
|
|
|
|
honor_snans = flag_signaling_nans != 0;
|
|
|
|
|
}
|
|
|
|
|
else if (INTEGRAL_TYPE_P (t) && TYPE_OVERFLOW_TRAPS (t))
|
|
|
|
|
honor_trapv = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check if the main expression may trap. */
|
|
|
|
|
t = is_gimple_assign (stmt) ? gimple_assign_rhs2 (stmt) : NULL;
|
|
|
|
|
ret = operation_could_trap_helper_p (code, fp_operation, honor_trapv,
|
|
|
|
|
honor_nans, honor_snans, t,
|
|
|
|
|
&handled);
|
|
|
|
|
if (handled)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
/* If the expression does not trap, see if any of the individual operands may
|
|
|
|
|
trap. */
|
|
|
|
|
for (i = 0; i < gimple_num_ops (stmt); i++)
|
|
|
|
|
if (tree_could_trap_p (gimple_op (stmt, i)))
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return true if statement STMT could throw an exception. */
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
stmt_could_throw_p (gimple stmt)
|
|
|
|
|
{
|
|
|
|
|
enum gimple_code code;
|
|
|
|
|
|
|
|
|
|
if (!flag_exceptions)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* The only statements that can throw an exception are assignments,
|
|
|
|
|
conditionals, calls and asms. */
|
|
|
|
|
code = gimple_code (stmt);
|
|
|
|
|
if (code != GIMPLE_ASSIGN
|
|
|
|
|
&& code != GIMPLE_COND
|
|
|
|
|
&& code != GIMPLE_CALL
|
|
|
|
|
&& code != GIMPLE_ASM)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* If exceptions can only be thrown by function calls and STMT is not a
|
|
|
|
|
GIMPLE_CALL, the statement cannot throw. */
|
|
|
|
|
if (!flag_non_call_exceptions && code != GIMPLE_CALL)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (code == GIMPLE_ASSIGN || code == GIMPLE_COND)
|
|
|
|
|
return stmt_could_throw_1_p (stmt);
|
|
|
|
|
else if (is_gimple_call (stmt))
|
2009-03-28 18:55:25 +01:00
|
|
|
|
return (gimple_call_flags (stmt) & ECF_NOTHROW) == 0;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
else if (gimple_code (stmt) == GIMPLE_ASM)
|
|
|
|
|
return (gimple_asm_volatile_p (stmt));
|
|
|
|
|
else
|
|
|
|
|
gcc_unreachable ();
|
|
|
|
|
|
|
|
|
|
return false;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Return true if expression T could throw an exception. */
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
bool
|
|
|
|
|
tree_could_throw_p (tree t)
|
|
|
|
|
{
|
|
|
|
|
if (!flag_exceptions)
|
|
|
|
|
return false;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (TREE_CODE (t) == MODIFY_EXPR)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2004-06-11 20:41:47 +02:00
|
|
|
|
if (flag_non_call_exceptions
|
2008-07-28 16:33:56 +02:00
|
|
|
|
&& tree_could_trap_p (TREE_OPERAND (t, 0)))
|
2004-06-11 20:41:47 +02:00
|
|
|
|
return true;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
t = TREE_OPERAND (t, 1);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 23:13:08 +02:00
|
|
|
|
if (TREE_CODE (t) == WITH_SIZE_EXPR)
|
|
|
|
|
t = TREE_OPERAND (t, 0);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (TREE_CODE (t) == CALL_EXPR)
|
|
|
|
|
return (call_expr_flags (t) & ECF_NOTHROW) == 0;
|
2004-06-11 20:41:47 +02:00
|
|
|
|
if (flag_non_call_exceptions)
|
|
|
|
|
return tree_could_trap_p (t);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-28 20:29:35 +01:00
|
|
|
|
/* Return true if STMT can throw an exception that is not caught within
|
|
|
|
|
the current function (CFUN). */
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
stmt_can_throw_external (gimple stmt)
|
|
|
|
|
{
|
|
|
|
|
int region_nr;
|
|
|
|
|
bool is_resx = false;
|
|
|
|
|
bool inlinable_call = false;
|
|
|
|
|
|
|
|
|
|
if (!stmt_could_throw_p (stmt))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (gimple_code (stmt) == GIMPLE_RESX)
|
|
|
|
|
{
|
|
|
|
|
region_nr = gimple_resx_region (stmt);
|
|
|
|
|
is_resx = true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
region_nr = lookup_stmt_eh_region (stmt);
|
|
|
|
|
|
|
|
|
|
if (region_nr < 0)
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
return can_throw_external_1 (region_nr, is_resx, inlinable_call);
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
|
|
|
|
/* Return true if STMT can throw an exception that is caught within
|
|
|
|
|
the current function (CFUN). */
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
stmt_can_throw_internal (gimple stmt)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
{
|
2005-05-14 16:32:39 +02:00
|
|
|
|
int region_nr;
|
2005-05-28 00:50:41 +02:00
|
|
|
|
bool is_resx = false;
|
2009-03-28 10:08:52 +01:00
|
|
|
|
bool inlinable_call = false;
|
2005-05-14 16:32:39 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (gimple_code (stmt) == GIMPLE_RESX)
|
|
|
|
|
{
|
|
|
|
|
region_nr = gimple_resx_region (stmt);
|
|
|
|
|
is_resx = true;
|
|
|
|
|
}
|
2005-05-14 16:32:39 +02:00
|
|
|
|
else
|
2009-03-28 10:08:52 +01:00
|
|
|
|
{
|
|
|
|
|
region_nr = lookup_stmt_eh_region (stmt);
|
|
|
|
|
inlinable_call = inlinable_call_p (stmt);
|
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (region_nr < 0)
|
|
|
|
|
return false;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
|
2009-03-28 10:08:52 +01:00
|
|
|
|
return can_throw_internal_1 (region_nr, is_resx, inlinable_call);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-05-17 01:14:02 +02:00
|
|
|
|
/* Given a statement OLD_STMT and a new statement NEW_STMT that has replaced
|
|
|
|
|
OLD_STMT in the function, remove OLD_STMT from the EH table and put NEW_STMT
|
|
|
|
|
in the table if it should be in there. Return TRUE if a replacement was
|
|
|
|
|
done that my require an EH edge purge. */
|
|
|
|
|
|
|
|
|
|
bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
maybe_clean_or_replace_eh_stmt (gimple old_stmt, gimple new_stmt)
|
2004-06-29 08:59:35 +02:00
|
|
|
|
{
|
2005-05-17 01:14:02 +02:00
|
|
|
|
int region_nr = lookup_stmt_eh_region (old_stmt);
|
|
|
|
|
|
|
|
|
|
if (region_nr >= 0)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
bool new_stmt_could_throw = stmt_could_throw_p (new_stmt);
|
2005-05-17 01:14:02 +02:00
|
|
|
|
|
|
|
|
|
if (new_stmt == old_stmt && new_stmt_could_throw)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
remove_stmt_from_eh_region (old_stmt);
|
|
|
|
|
if (new_stmt_could_throw)
|
|
|
|
|
{
|
|
|
|
|
add_stmt_to_eh_region (new_stmt, region_nr);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2004-06-29 08:59:35 +02:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
/* Returns TRUE if oneh and twoh are exception handlers (gimple_try_cleanup of
|
|
|
|
|
GIMPLE_TRY) that are similar enough to be considered the same. Currently
|
|
|
|
|
this only handles handlers consisting of a single call, as that's the
|
|
|
|
|
important case for C++: a destructor call for a particular object showing
|
|
|
|
|
up in multiple handlers. */
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
|
|
|
|
static bool
|
2008-07-28 16:33:56 +02:00
|
|
|
|
same_handler_p (gimple_seq oneh, gimple_seq twoh)
|
2007-10-03 12:43:42 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_stmt_iterator gsi;
|
|
|
|
|
gimple ones, twos;
|
|
|
|
|
unsigned int ai;
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi = gsi_start (oneh);
|
|
|
|
|
if (!gsi_one_before_end_p (gsi))
|
2007-10-03 12:43:42 +02:00
|
|
|
|
return false;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
ones = gsi_stmt (gsi);
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi = gsi_start (twoh);
|
|
|
|
|
if (!gsi_one_before_end_p (gsi))
|
2007-10-03 12:43:42 +02:00
|
|
|
|
return false;
|
2008-07-28 16:33:56 +02:00
|
|
|
|
twos = gsi_stmt (gsi);
|
|
|
|
|
|
|
|
|
|
if (!is_gimple_call (ones)
|
|
|
|
|
|| !is_gimple_call (twos)
|
|
|
|
|
|| gimple_call_lhs (ones)
|
|
|
|
|
|| gimple_call_lhs (twos)
|
|
|
|
|
|| gimple_call_chain (ones)
|
|
|
|
|
|| gimple_call_chain (twos)
|
|
|
|
|
|| !operand_equal_p (gimple_call_fn (ones), gimple_call_fn (twos), 0)
|
|
|
|
|
|| gimple_call_num_args (ones) != gimple_call_num_args (twos))
|
2007-10-03 12:43:42 +02:00
|
|
|
|
return false;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
for (ai = 0; ai < gimple_call_num_args (ones); ++ai)
|
|
|
|
|
if (!operand_equal_p (gimple_call_arg (ones, ai),
|
|
|
|
|
gimple_call_arg (twos, ai), 0))
|
2007-10-03 12:43:42 +02:00
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Optimize
|
|
|
|
|
try { A() } finally { try { ~B() } catch { ~A() } }
|
|
|
|
|
try { ... } finally { ~A() }
|
|
|
|
|
into
|
|
|
|
|
try { A() } catch { ~B() }
|
|
|
|
|
try { ~B() ... } finally { ~A() }
|
|
|
|
|
|
|
|
|
|
This occurs frequently in C++, where A is a local variable and B is a
|
|
|
|
|
temporary used in the initializer for A. */
|
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
optimize_double_finally (gimple one, gimple two)
|
2007-10-03 12:43:42 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple oneh;
|
|
|
|
|
gimple_stmt_iterator gsi;
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gsi = gsi_start (gimple_try_cleanup (one));
|
|
|
|
|
if (!gsi_one_before_end_p (gsi))
|
2007-10-03 12:43:42 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
oneh = gsi_stmt (gsi);
|
|
|
|
|
if (gimple_code (oneh) != GIMPLE_TRY
|
|
|
|
|
|| gimple_try_kind (oneh) != GIMPLE_TRY_CATCH)
|
2007-10-03 12:43:42 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (same_handler_p (gimple_try_cleanup (oneh), gimple_try_cleanup (two)))
|
2007-10-03 12:43:42 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_seq seq = gimple_try_eval (oneh);
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_try_set_cleanup (one, seq);
|
|
|
|
|
gimple_try_set_kind (one, GIMPLE_TRY_CATCH);
|
|
|
|
|
seq = copy_gimple_seq_and_replace_locals (seq);
|
|
|
|
|
gimple_seq_add_seq (&seq, gimple_try_eval (two));
|
|
|
|
|
gimple_try_set_eval (two, seq);
|
2007-10-03 12:43:42 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Perform EH refactoring optimizations that are simpler to do when code
|
fixed-bit.c, [...]: Fix comment typos.
* config/fixed-bit.c, config/i386/cpuid.h, config/i386/i386.c,
config/i386/i386.md, config/i386/sse.md, function.c, jump.c,
modulo-sched.c, ra-conflict.c, toplev.c, tree-eh.c, tree-sra.c,
tree-ssa-dse.c, tree-vect-analyze.c, tree-vect-patterns.c,
tree-vect-transform.c: Fix comment typos.
* doc/extend.texi: Fix a typo.
From-SVN: r129291
2007-10-14 03:36:18 +02:00
|
|
|
|
flow has been lowered but EH structures haven't. */
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2008-07-28 16:33:56 +02:00
|
|
|
|
refactor_eh_r (gimple_seq seq)
|
2007-10-03 12:43:42 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
gimple_stmt_iterator gsi;
|
|
|
|
|
gimple one, two;
|
2007-10-03 12:43:42 +02:00
|
|
|
|
|
2008-07-28 16:33:56 +02:00
|
|
|
|
one = NULL;
|
|
|
|
|
two = NULL;
|
|
|
|
|
gsi = gsi_start (seq);
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
one = two;
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
two = NULL;
|
|
|
|
|
else
|
|
|
|
|
two = gsi_stmt (gsi);
|
|
|
|
|
if (one
|
|
|
|
|
&& two
|
|
|
|
|
&& gimple_code (one) == GIMPLE_TRY
|
|
|
|
|
&& gimple_code (two) == GIMPLE_TRY
|
|
|
|
|
&& gimple_try_kind (one) == GIMPLE_TRY_FINALLY
|
|
|
|
|
&& gimple_try_kind (two) == GIMPLE_TRY_FINALLY)
|
|
|
|
|
optimize_double_finally (one, two);
|
|
|
|
|
if (one)
|
|
|
|
|
switch (gimple_code (one))
|
2007-10-03 12:43:42 +02:00
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
case GIMPLE_TRY:
|
|
|
|
|
refactor_eh_r (gimple_try_eval (one));
|
|
|
|
|
refactor_eh_r (gimple_try_cleanup (one));
|
|
|
|
|
break;
|
|
|
|
|
case GIMPLE_CATCH:
|
|
|
|
|
refactor_eh_r (gimple_catch_handler (one));
|
|
|
|
|
break;
|
|
|
|
|
case GIMPLE_EH_FILTER:
|
|
|
|
|
refactor_eh_r (gimple_eh_filter_failure (one));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
2007-10-03 12:43:42 +02:00
|
|
|
|
}
|
2008-07-28 16:33:56 +02:00
|
|
|
|
if (two)
|
|
|
|
|
gsi_next (&gsi);
|
|
|
|
|
else
|
|
|
|
|
break;
|
2007-10-03 12:43:42 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned
|
|
|
|
|
refactor_eh (void)
|
|
|
|
|
{
|
2008-07-28 16:33:56 +02:00
|
|
|
|
refactor_eh_r (gimple_body (current_function_decl));
|
2007-10-03 12:43:42 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
re PR other/35094 (RTL dump file letters hosed and partly undocumented)
* gcc.dg/20050811-2.c: Update dumping flags.
* gcc.dg/sms-2.c: Update dumping flags.
* gcc.dg/var-expand1.c: Update dumping flags.
* gcc.dg/var-expand3.c: Update dumping flags.
* gcc.dg/pr30957-1.c: Update dumping flags.
* gcc.dg/20050811-1.c: Update dumping flags.
* gcc.dg/cpp/cmdlne-dI-M.C: Do not xfail.
* gcc.dg/cpp/cmdlne-dM-M.C: Do not xfail.
PR other/35094
* toplev.c (decode_d_option): Handle all CPP flags.
* tree-vrp.c: Update tree_pass descriptors.
* regrename.c: Update tree_pass descriptors.
* fwprop.c: Update tree_pass descriptors.
* doc/invoke.texi: Remove documentation of dropped -d? flags.
* tree-into-ssa.c: Update tree_pass descriptors.
* tree-dump.c: Update tree_pass descriptors.
* tree-complex.c: Update tree_pass descriptors.
* tree-dump.h: Update tree_pass descriptors.
* see.c: Update tree_pass descriptors.
* cgraphbuild.c: Update tree_pass descriptors.
* tracer.c: Update tree_pass descriptors.
* tree-loop-distribution.c: Update tree_pass descriptors.
* cgraph.c: Update tree_pass descriptors.
* postreload-gcse.c: Update tree_pass descriptors.
* postreload.c: Update tree_pass descriptors.
* tree-ssa-loop-ch.c: Update tree_pass descriptors.
* tree-tailcall.c: Update tree_pass descriptors.
* tree-pass.h (tree_opt_pass): Rename to ...
(opt_pass) ... this one; add "type" field and remove letter field.
(gimple_opt_pass, rtl_opt_pass, simple_ipa_opt_pass): New.
(execute_pass_list, execute_ipa_pass_list, all_passes, all_ipa_passes,
all_lowering_passes): Update declaration.
* ipa-cp.c: Update tree_pass descriptors.
* final.c: Update tree_pass descriptors.
* omp-low.c: Update tree_pass descriptors.
* tree-ssa-dse.c: Update tree_pass descriptors.
* ipa-reference.c: Update tree_pass descriptors.
* tree-ssa-uncprop.c: Update tree_pass descriptors.
* auto-inc-dec.c: Update tree_pass descriptors.
* reorg.c: Update tree_pass descriptors.
* cgraphunit.c: Update tree_pass descriptors.
* tree-ssa-copyrename.c: Update tree_pass descriptors.
* tree-ssa-ccp.c: Update tree_pass descriptors.
* df-core.c: Update tree_pass descriptors.
* mode-switching.c: Update tree_pass descriptors.
* tree-nomudflap.c: Update tree_pass descriptors.
* modulo-sched.c: Update tree_pass descriptors.
* ipa-pure-const.c: Update tree_pass descriptors.
* cse.c: Update tree_pass descriptors.
* web.c: Update tree_pass descriptors.
* tree-stdarg.c: Update tree_pass descriptors.
* tree-ssa-math-opts.c: Update tree_pass descriptors.
* tree-ssa-dom.c: Update tree_pass descriptors.
* tree-nrv.c: Update tree_pass descriptors.
* tree-ssa-alias.c: Update tree_pass descriptors.
* loop-init.c: Update tree_pass descriptors.
* gimple-low.c: Update tree_pass descriptors.
* ipa-inline.c: Update tree_pass descriptors.
* tree-ssa-sink.c: Update tree_pass descriptors.
* global.c: Update tree_pass descriptors.
* ifcvt.c: Update tree_pass descriptors.
* jump.c: Update tree_pass descriptors.
* predict.c: Update tree_pass descriptors.
* tree-ssa-loop.c: Update tree_pass descriptors.
* recog.c: Update tree_pass descriptors.
* dse.c: Update tree_pass descriptors.
* tree-ssa-ifcombine.c: Update tree_pass descriptors.
* tree-eh.c: Update tree_pass descriptors.
* regmove.c: Update tree_pass descriptors.
* local-alloc.c
* function.c: Update tree_pass descriptors.
* tree-vectorizer.c: Update tree_pass descriptors.
* gcse.c: Update tree_pass descriptors.
* ipa-type-escape.c: Update tree_pass descriptors.
* tree-if-conv.c: Update tree_pass descriptors.
* init-regs.c: Update tree_pass descriptors.
* ipa.c: Update tree_pass descriptors.
* tree-ssa-phiopt.c: Update tree_pass descriptors.
* rtl-factoring.c: Update tree_pass descriptors.
* lower-subreg.c: Update tree_pass descriptors.
* bt-load.c: Update tree_pass descriptors.
* tree-dfa.c: Update tree_pass descriptors.
* except.c: Update tree_pass descriptors.
* emit-rtl.c: Update tree_pass descriptors.
* cfgexpand.c: Update tree_pass descriptors.
* tree-cfgcleanup.c: Update tree_pass descriptors.
* cfgcleanup.c: Update tree_pass descriptors.
* tree-ssa-pre.c: Update tree_pass descriptors.
* tree-sra.c: Update tree_pass descriptors.
* tree-mudflap.c: Update tree_pass descriptors.
* tree-ssa-copy.c: Update tree_pass descriptors.
* cfglayout.c: Update tree_pass descriptors.
* tree-ssa-forwprop.c: Update tree_pass descriptors.
* tree-ssa-dce.c: Update tree_pass descriptors.
* tree-ssa.c: Update tree_pass descriptors.
* regclass.c: Update tree_pass descriptors.
* integrate.c: Update tree_pass descriptors.
* tree-optimize.c: Update tree_pass descriptors.
* tree-ssa-phiprop.c: Update tree_pass descriptors.
* tree-object-size.c: Update tree_pass descriptors.
* combine.c: Update tree_pass descriptors.
* tree-outof-ssa.c: Update tree_pass descriptors.
* bb-reorder.c: Update tree_pass descriptors.
* stack-ptr-mod.c: Update tree_pass descriptors.
* var-tracking.c: Update tree_pass descriptors.
* tree-profile.c: Update tree_pass descriptors.
* tree-vect-generic.c: Update tree_pass descriptors.
* reg-stack.c: Update tree_pass descriptors.
* sched-rgn.c: Update tree_pass descriptors.
* tree-ssa-structalias.c: Update tree_pass descriptors.
* tree-cfg.c: Update tree_pass descriptors.
* passes.c (current_pass): Update declaration.
(finish_optimization_passes): Update.
(all_passes, all_ipa_passes, all_lowering_passes): Update declaration.
(register_one_dump_file, register_dump_files_1, next_pass_1):
Update arguments.
(init_optimization_passes): Update handling of new types.
(execute_one_pass, execute_pass_list, execute_ipa_pass_list): Update.
* ipa-struct-reorg.c: Update tree_pass descriptors.
* tree-ssa-reassoc.c: Update tree_pass descriptors.
* combine-stack-adj.c: Update tree_pass descriptors.
* cfgrtl.c: Update tree_pass descriptors.
* dce.c: Update tree_pass descriptors.
* tree-ssanames.c: Update tree_pass descriptors.
From-SVN: r133342
2008-03-19 12:22:40 +01:00
|
|
|
|
struct gimple_opt_pass pass_refactor_eh =
|
2007-10-03 12:43:42 +02:00
|
|
|
|
{
|
re PR other/35094 (RTL dump file letters hosed and partly undocumented)
* gcc.dg/20050811-2.c: Update dumping flags.
* gcc.dg/sms-2.c: Update dumping flags.
* gcc.dg/var-expand1.c: Update dumping flags.
* gcc.dg/var-expand3.c: Update dumping flags.
* gcc.dg/pr30957-1.c: Update dumping flags.
* gcc.dg/20050811-1.c: Update dumping flags.
* gcc.dg/cpp/cmdlne-dI-M.C: Do not xfail.
* gcc.dg/cpp/cmdlne-dM-M.C: Do not xfail.
PR other/35094
* toplev.c (decode_d_option): Handle all CPP flags.
* tree-vrp.c: Update tree_pass descriptors.
* regrename.c: Update tree_pass descriptors.
* fwprop.c: Update tree_pass descriptors.
* doc/invoke.texi: Remove documentation of dropped -d? flags.
* tree-into-ssa.c: Update tree_pass descriptors.
* tree-dump.c: Update tree_pass descriptors.
* tree-complex.c: Update tree_pass descriptors.
* tree-dump.h: Update tree_pass descriptors.
* see.c: Update tree_pass descriptors.
* cgraphbuild.c: Update tree_pass descriptors.
* tracer.c: Update tree_pass descriptors.
* tree-loop-distribution.c: Update tree_pass descriptors.
* cgraph.c: Update tree_pass descriptors.
* postreload-gcse.c: Update tree_pass descriptors.
* postreload.c: Update tree_pass descriptors.
* tree-ssa-loop-ch.c: Update tree_pass descriptors.
* tree-tailcall.c: Update tree_pass descriptors.
* tree-pass.h (tree_opt_pass): Rename to ...
(opt_pass) ... this one; add "type" field and remove letter field.
(gimple_opt_pass, rtl_opt_pass, simple_ipa_opt_pass): New.
(execute_pass_list, execute_ipa_pass_list, all_passes, all_ipa_passes,
all_lowering_passes): Update declaration.
* ipa-cp.c: Update tree_pass descriptors.
* final.c: Update tree_pass descriptors.
* omp-low.c: Update tree_pass descriptors.
* tree-ssa-dse.c: Update tree_pass descriptors.
* ipa-reference.c: Update tree_pass descriptors.
* tree-ssa-uncprop.c: Update tree_pass descriptors.
* auto-inc-dec.c: Update tree_pass descriptors.
* reorg.c: Update tree_pass descriptors.
* cgraphunit.c: Update tree_pass descriptors.
* tree-ssa-copyrename.c: Update tree_pass descriptors.
* tree-ssa-ccp.c: Update tree_pass descriptors.
* df-core.c: Update tree_pass descriptors.
* mode-switching.c: Update tree_pass descriptors.
* tree-nomudflap.c: Update tree_pass descriptors.
* modulo-sched.c: Update tree_pass descriptors.
* ipa-pure-const.c: Update tree_pass descriptors.
* cse.c: Update tree_pass descriptors.
* web.c: Update tree_pass descriptors.
* tree-stdarg.c: Update tree_pass descriptors.
* tree-ssa-math-opts.c: Update tree_pass descriptors.
* tree-ssa-dom.c: Update tree_pass descriptors.
* tree-nrv.c: Update tree_pass descriptors.
* tree-ssa-alias.c: Update tree_pass descriptors.
* loop-init.c: Update tree_pass descriptors.
* gimple-low.c: Update tree_pass descriptors.
* ipa-inline.c: Update tree_pass descriptors.
* tree-ssa-sink.c: Update tree_pass descriptors.
* global.c: Update tree_pass descriptors.
* ifcvt.c: Update tree_pass descriptors.
* jump.c: Update tree_pass descriptors.
* predict.c: Update tree_pass descriptors.
* tree-ssa-loop.c: Update tree_pass descriptors.
* recog.c: Update tree_pass descriptors.
* dse.c: Update tree_pass descriptors.
* tree-ssa-ifcombine.c: Update tree_pass descriptors.
* tree-eh.c: Update tree_pass descriptors.
* regmove.c: Update tree_pass descriptors.
* local-alloc.c
* function.c: Update tree_pass descriptors.
* tree-vectorizer.c: Update tree_pass descriptors.
* gcse.c: Update tree_pass descriptors.
* ipa-type-escape.c: Update tree_pass descriptors.
* tree-if-conv.c: Update tree_pass descriptors.
* init-regs.c: Update tree_pass descriptors.
* ipa.c: Update tree_pass descriptors.
* tree-ssa-phiopt.c: Update tree_pass descriptors.
* rtl-factoring.c: Update tree_pass descriptors.
* lower-subreg.c: Update tree_pass descriptors.
* bt-load.c: Update tree_pass descriptors.
* tree-dfa.c: Update tree_pass descriptors.
* except.c: Update tree_pass descriptors.
* emit-rtl.c: Update tree_pass descriptors.
* cfgexpand.c: Update tree_pass descriptors.
* tree-cfgcleanup.c: Update tree_pass descriptors.
* cfgcleanup.c: Update tree_pass descriptors.
* tree-ssa-pre.c: Update tree_pass descriptors.
* tree-sra.c: Update tree_pass descriptors.
* tree-mudflap.c: Update tree_pass descriptors.
* tree-ssa-copy.c: Update tree_pass descriptors.
* cfglayout.c: Update tree_pass descriptors.
* tree-ssa-forwprop.c: Update tree_pass descriptors.
* tree-ssa-dce.c: Update tree_pass descriptors.
* tree-ssa.c: Update tree_pass descriptors.
* regclass.c: Update tree_pass descriptors.
* integrate.c: Update tree_pass descriptors.
* tree-optimize.c: Update tree_pass descriptors.
* tree-ssa-phiprop.c: Update tree_pass descriptors.
* tree-object-size.c: Update tree_pass descriptors.
* combine.c: Update tree_pass descriptors.
* tree-outof-ssa.c: Update tree_pass descriptors.
* bb-reorder.c: Update tree_pass descriptors.
* stack-ptr-mod.c: Update tree_pass descriptors.
* var-tracking.c: Update tree_pass descriptors.
* tree-profile.c: Update tree_pass descriptors.
* tree-vect-generic.c: Update tree_pass descriptors.
* reg-stack.c: Update tree_pass descriptors.
* sched-rgn.c: Update tree_pass descriptors.
* tree-ssa-structalias.c: Update tree_pass descriptors.
* tree-cfg.c: Update tree_pass descriptors.
* passes.c (current_pass): Update declaration.
(finish_optimization_passes): Update.
(all_passes, all_ipa_passes, all_lowering_passes): Update declaration.
(register_one_dump_file, register_dump_files_1, next_pass_1):
Update arguments.
(init_optimization_passes): Update handling of new types.
(execute_one_pass, execute_pass_list, execute_ipa_pass_list): Update.
* ipa-struct-reorg.c: Update tree_pass descriptors.
* tree-ssa-reassoc.c: Update tree_pass descriptors.
* combine-stack-adj.c: Update tree_pass descriptors.
* cfgrtl.c: Update tree_pass descriptors.
* dce.c: Update tree_pass descriptors.
* tree-ssanames.c: Update tree_pass descriptors.
From-SVN: r133342
2008-03-19 12:22:40 +01:00
|
|
|
|
{
|
|
|
|
|
GIMPLE_PASS,
|
2007-10-03 12:43:42 +02:00
|
|
|
|
"ehopt", /* name */
|
|
|
|
|
NULL, /* gate */
|
|
|
|
|
refactor_eh, /* execute */
|
|
|
|
|
NULL, /* sub */
|
|
|
|
|
NULL, /* next */
|
|
|
|
|
0, /* static_pass_number */
|
|
|
|
|
TV_TREE_EH, /* tv_id */
|
|
|
|
|
PROP_gimple_lcf, /* properties_required */
|
|
|
|
|
0, /* properties_provided */
|
|
|
|
|
0, /* properties_destroyed */
|
|
|
|
|
0, /* todo_flags_start */
|
re PR other/35094 (RTL dump file letters hosed and partly undocumented)
* gcc.dg/20050811-2.c: Update dumping flags.
* gcc.dg/sms-2.c: Update dumping flags.
* gcc.dg/var-expand1.c: Update dumping flags.
* gcc.dg/var-expand3.c: Update dumping flags.
* gcc.dg/pr30957-1.c: Update dumping flags.
* gcc.dg/20050811-1.c: Update dumping flags.
* gcc.dg/cpp/cmdlne-dI-M.C: Do not xfail.
* gcc.dg/cpp/cmdlne-dM-M.C: Do not xfail.
PR other/35094
* toplev.c (decode_d_option): Handle all CPP flags.
* tree-vrp.c: Update tree_pass descriptors.
* regrename.c: Update tree_pass descriptors.
* fwprop.c: Update tree_pass descriptors.
* doc/invoke.texi: Remove documentation of dropped -d? flags.
* tree-into-ssa.c: Update tree_pass descriptors.
* tree-dump.c: Update tree_pass descriptors.
* tree-complex.c: Update tree_pass descriptors.
* tree-dump.h: Update tree_pass descriptors.
* see.c: Update tree_pass descriptors.
* cgraphbuild.c: Update tree_pass descriptors.
* tracer.c: Update tree_pass descriptors.
* tree-loop-distribution.c: Update tree_pass descriptors.
* cgraph.c: Update tree_pass descriptors.
* postreload-gcse.c: Update tree_pass descriptors.
* postreload.c: Update tree_pass descriptors.
* tree-ssa-loop-ch.c: Update tree_pass descriptors.
* tree-tailcall.c: Update tree_pass descriptors.
* tree-pass.h (tree_opt_pass): Rename to ...
(opt_pass) ... this one; add "type" field and remove letter field.
(gimple_opt_pass, rtl_opt_pass, simple_ipa_opt_pass): New.
(execute_pass_list, execute_ipa_pass_list, all_passes, all_ipa_passes,
all_lowering_passes): Update declaration.
* ipa-cp.c: Update tree_pass descriptors.
* final.c: Update tree_pass descriptors.
* omp-low.c: Update tree_pass descriptors.
* tree-ssa-dse.c: Update tree_pass descriptors.
* ipa-reference.c: Update tree_pass descriptors.
* tree-ssa-uncprop.c: Update tree_pass descriptors.
* auto-inc-dec.c: Update tree_pass descriptors.
* reorg.c: Update tree_pass descriptors.
* cgraphunit.c: Update tree_pass descriptors.
* tree-ssa-copyrename.c: Update tree_pass descriptors.
* tree-ssa-ccp.c: Update tree_pass descriptors.
* df-core.c: Update tree_pass descriptors.
* mode-switching.c: Update tree_pass descriptors.
* tree-nomudflap.c: Update tree_pass descriptors.
* modulo-sched.c: Update tree_pass descriptors.
* ipa-pure-const.c: Update tree_pass descriptors.
* cse.c: Update tree_pass descriptors.
* web.c: Update tree_pass descriptors.
* tree-stdarg.c: Update tree_pass descriptors.
* tree-ssa-math-opts.c: Update tree_pass descriptors.
* tree-ssa-dom.c: Update tree_pass descriptors.
* tree-nrv.c: Update tree_pass descriptors.
* tree-ssa-alias.c: Update tree_pass descriptors.
* loop-init.c: Update tree_pass descriptors.
* gimple-low.c: Update tree_pass descriptors.
* ipa-inline.c: Update tree_pass descriptors.
* tree-ssa-sink.c: Update tree_pass descriptors.
* global.c: Update tree_pass descriptors.
* ifcvt.c: Update tree_pass descriptors.
* jump.c: Update tree_pass descriptors.
* predict.c: Update tree_pass descriptors.
* tree-ssa-loop.c: Update tree_pass descriptors.
* recog.c: Update tree_pass descriptors.
* dse.c: Update tree_pass descriptors.
* tree-ssa-ifcombine.c: Update tree_pass descriptors.
* tree-eh.c: Update tree_pass descriptors.
* regmove.c: Update tree_pass descriptors.
* local-alloc.c
* function.c: Update tree_pass descriptors.
* tree-vectorizer.c: Update tree_pass descriptors.
* gcse.c: Update tree_pass descriptors.
* ipa-type-escape.c: Update tree_pass descriptors.
* tree-if-conv.c: Update tree_pass descriptors.
* init-regs.c: Update tree_pass descriptors.
* ipa.c: Update tree_pass descriptors.
* tree-ssa-phiopt.c: Update tree_pass descriptors.
* rtl-factoring.c: Update tree_pass descriptors.
* lower-subreg.c: Update tree_pass descriptors.
* bt-load.c: Update tree_pass descriptors.
* tree-dfa.c: Update tree_pass descriptors.
* except.c: Update tree_pass descriptors.
* emit-rtl.c: Update tree_pass descriptors.
* cfgexpand.c: Update tree_pass descriptors.
* tree-cfgcleanup.c: Update tree_pass descriptors.
* cfgcleanup.c: Update tree_pass descriptors.
* tree-ssa-pre.c: Update tree_pass descriptors.
* tree-sra.c: Update tree_pass descriptors.
* tree-mudflap.c: Update tree_pass descriptors.
* tree-ssa-copy.c: Update tree_pass descriptors.
* cfglayout.c: Update tree_pass descriptors.
* tree-ssa-forwprop.c: Update tree_pass descriptors.
* tree-ssa-dce.c: Update tree_pass descriptors.
* tree-ssa.c: Update tree_pass descriptors.
* regclass.c: Update tree_pass descriptors.
* integrate.c: Update tree_pass descriptors.
* tree-optimize.c: Update tree_pass descriptors.
* tree-ssa-phiprop.c: Update tree_pass descriptors.
* tree-object-size.c: Update tree_pass descriptors.
* combine.c: Update tree_pass descriptors.
* tree-outof-ssa.c: Update tree_pass descriptors.
* bb-reorder.c: Update tree_pass descriptors.
* stack-ptr-mod.c: Update tree_pass descriptors.
* var-tracking.c: Update tree_pass descriptors.
* tree-profile.c: Update tree_pass descriptors.
* tree-vect-generic.c: Update tree_pass descriptors.
* reg-stack.c: Update tree_pass descriptors.
* sched-rgn.c: Update tree_pass descriptors.
* tree-ssa-structalias.c: Update tree_pass descriptors.
* tree-cfg.c: Update tree_pass descriptors.
* passes.c (current_pass): Update declaration.
(finish_optimization_passes): Update.
(all_passes, all_ipa_passes, all_lowering_passes): Update declaration.
(register_one_dump_file, register_dump_files_1, next_pass_1):
Update arguments.
(init_optimization_passes): Update handling of new types.
(execute_one_pass, execute_pass_list, execute_ipa_pass_list): Update.
* ipa-struct-reorg.c: Update tree_pass descriptors.
* tree-ssa-reassoc.c: Update tree_pass descriptors.
* combine-stack-adj.c: Update tree_pass descriptors.
* cfgrtl.c: Update tree_pass descriptors.
* dce.c: Update tree_pass descriptors.
* tree-ssanames.c: Update tree_pass descriptors.
From-SVN: r133342
2008-03-19 12:22:40 +01:00
|
|
|
|
TODO_dump_func /* todo_flags_finish */
|
|
|
|
|
}
|
2007-10-03 12:43:42 +02:00
|
|
|
|
};
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
|
|
|
|
/* Walk statements, see what regions are really references and remove unreachable ones. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
tree_remove_unreachable_handlers (void)
|
|
|
|
|
{
|
|
|
|
|
sbitmap reachable, contains_stmt;
|
|
|
|
|
VEC(int,heap) * label_to_region;
|
|
|
|
|
basic_block bb;
|
|
|
|
|
|
|
|
|
|
label_to_region = label_to_region_map ();
|
|
|
|
|
reachable = sbitmap_alloc (num_eh_regions ());
|
|
|
|
|
sbitmap_zero (reachable);
|
|
|
|
|
contains_stmt = sbitmap_alloc (num_eh_regions ());
|
|
|
|
|
sbitmap_zero (contains_stmt);
|
|
|
|
|
|
|
|
|
|
FOR_EACH_BB (bb)
|
|
|
|
|
{
|
|
|
|
|
gimple_stmt_iterator gsi;
|
|
|
|
|
int region;
|
2009-03-31 00:35:22 +02:00
|
|
|
|
bool has_eh_preds = bb_has_eh_pred (bb);
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
|
|
|
|
for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
|
|
|
|
|
{
|
|
|
|
|
gimple stmt = gsi_stmt (gsi);
|
|
|
|
|
|
|
|
|
|
if (gimple_code (stmt) == GIMPLE_LABEL && has_eh_preds)
|
|
|
|
|
{
|
|
|
|
|
int uid = LABEL_DECL_UID (gimple_label_label (stmt));
|
2009-03-31 00:35:22 +02:00
|
|
|
|
int region = VEC_index (int, label_to_region, uid);
|
|
|
|
|
SET_BIT (reachable, region);
|
2009-03-29 15:32:13 +02:00
|
|
|
|
}
|
2009-04-01 02:03:31 +02:00
|
|
|
|
if (gimple_code (stmt) == GIMPLE_RESX)
|
2009-03-29 15:32:13 +02:00
|
|
|
|
SET_BIT (reachable, gimple_resx_region (stmt));
|
|
|
|
|
if ((region = lookup_stmt_eh_region (stmt)) >= 0)
|
|
|
|
|
SET_BIT (contains_stmt, region);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dump_file)
|
|
|
|
|
{
|
|
|
|
|
fprintf (dump_file, "Before removal of unreachable regions:\n");
|
|
|
|
|
dump_eh_tree (dump_file, cfun);
|
|
|
|
|
fprintf (dump_file, "Reachable regions: ");
|
|
|
|
|
dump_sbitmap_file (dump_file, reachable);
|
|
|
|
|
fprintf (dump_file, "Regions containing insns: ");
|
|
|
|
|
dump_sbitmap_file (dump_file, contains_stmt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
remove_unreachable_regions (reachable, contains_stmt);
|
|
|
|
|
sbitmap_free (reachable);
|
|
|
|
|
sbitmap_free (contains_stmt);
|
|
|
|
|
VEC_free (int, heap, label_to_region);
|
|
|
|
|
if (dump_file)
|
|
|
|
|
{
|
|
|
|
|
fprintf (dump_file, "\n\nAfter removal of unreachable regions:\n");
|
|
|
|
|
dump_eh_tree (dump_file, cfun);
|
|
|
|
|
fprintf (dump_file, "\n\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Pattern match emtpy EH receiver looking like:
|
|
|
|
|
|
|
|
|
|
save_filt.6352_662 = [filter_expr] <<<filter object>>>;
|
|
|
|
|
save_eptr.6351_663 = [exc_ptr_expr] <<<exception object>>>;
|
|
|
|
|
<<<exception object>>> = save_eptr.6351_663;
|
|
|
|
|
<<<filter object>>> = save_filt.6352_662;
|
|
|
|
|
resx 1
|
2009-04-04 19:09:45 +02:00
|
|
|
|
|
|
|
|
|
And various minor variants after DCE or copy propagation.
|
2009-03-29 15:32:13 +02:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
tree_empty_eh_handler_p (basic_block bb)
|
|
|
|
|
{
|
|
|
|
|
gimple_stmt_iterator gsi;
|
|
|
|
|
int region;
|
2009-04-04 19:09:45 +02:00
|
|
|
|
use_operand_p imm_use;
|
|
|
|
|
gimple use_stmt;
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
|
|
|
|
gsi = gsi_last_bb (bb);
|
|
|
|
|
|
|
|
|
|
/* RESX */
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
return 0;
|
|
|
|
|
if (gimple_code (gsi_stmt (gsi)) != GIMPLE_RESX)
|
|
|
|
|
return 0;
|
|
|
|
|
region = gimple_resx_region (gsi_stmt (gsi));
|
|
|
|
|
|
|
|
|
|
/* filter_object set. */
|
|
|
|
|
gsi_prev (&gsi);
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
return 0;
|
2009-04-04 19:09:45 +02:00
|
|
|
|
if (gimple_code (gsi_stmt (gsi)) == GIMPLE_ASSIGN)
|
|
|
|
|
{
|
|
|
|
|
tree filter_tmp;
|
|
|
|
|
tree exc_ptr_tmp;
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
2009-04-04 19:09:45 +02:00
|
|
|
|
if (TREE_CODE (gimple_assign_lhs (gsi_stmt (gsi))) != FILTER_EXPR)
|
|
|
|
|
return 0;
|
|
|
|
|
filter_tmp = gimple_assign_rhs1 (gsi_stmt (gsi));
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
2009-04-04 19:09:45 +02:00
|
|
|
|
/* filter_object set. */
|
|
|
|
|
gsi_prev (&gsi);
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
return 0;
|
|
|
|
|
if (gimple_code (gsi_stmt (gsi)) != GIMPLE_ASSIGN)
|
|
|
|
|
return 0;
|
|
|
|
|
if (TREE_CODE (gimple_assign_lhs (gsi_stmt (gsi))) != EXC_PTR_EXPR)
|
|
|
|
|
return 0;
|
|
|
|
|
exc_ptr_tmp = gimple_assign_rhs1 (gsi_stmt (gsi));
|
|
|
|
|
|
|
|
|
|
/* exc_ptr get. */
|
|
|
|
|
if (TREE_CODE (exc_ptr_tmp) != EXC_PTR_EXPR)
|
|
|
|
|
{
|
|
|
|
|
gsi_prev (&gsi);
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
return 0;
|
|
|
|
|
if (gimple_code (gsi_stmt (gsi)) != GIMPLE_ASSIGN)
|
|
|
|
|
return 0;
|
|
|
|
|
if (TREE_CODE (gimple_assign_rhs1 (gsi_stmt (gsi))) != EXC_PTR_EXPR)
|
|
|
|
|
return 0;
|
|
|
|
|
if (exc_ptr_tmp != gimple_assign_lhs (gsi_stmt (gsi)))
|
|
|
|
|
return 0;
|
|
|
|
|
if (!single_imm_use (exc_ptr_tmp, &imm_use, &use_stmt))
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
2009-04-04 19:09:45 +02:00
|
|
|
|
/* filter_object get. */
|
|
|
|
|
if (TREE_CODE (filter_tmp) != FILTER_EXPR)
|
|
|
|
|
{
|
|
|
|
|
gsi_prev (&gsi);
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
return 0;
|
|
|
|
|
if (gimple_code (gsi_stmt (gsi)) != GIMPLE_ASSIGN)
|
|
|
|
|
return 0;
|
|
|
|
|
if (TREE_CODE (gimple_assign_rhs1 (gsi_stmt (gsi))) != FILTER_EXPR)
|
|
|
|
|
return 0;
|
|
|
|
|
if (filter_tmp != gimple_assign_lhs (gsi_stmt (gsi)))
|
|
|
|
|
return 0;
|
|
|
|
|
if (!single_imm_use (filter_tmp, &imm_use, &use_stmt))
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
2009-04-04 19:09:45 +02:00
|
|
|
|
/* label. */
|
|
|
|
|
gsi_prev (&gsi);
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
while (gimple_code (gsi_stmt (gsi)) == GIMPLE_LABEL)
|
|
|
|
|
{
|
|
|
|
|
if (gimple_label_label (gsi_stmt (gsi))
|
|
|
|
|
== get_eh_region_no_tree_label (region))
|
|
|
|
|
return region;
|
|
|
|
|
gsi_prev (&gsi);
|
|
|
|
|
if (gsi_end_p (gsi))
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return true if it is possible to remove basic block BB and propagate
|
|
|
|
|
through PHIs.
|
|
|
|
|
|
|
|
|
|
This means that every PHI in BB has all uses such that they are PHIs
|
|
|
|
|
of basic blocks reachable througt BB and they appears only in use
|
|
|
|
|
reachable by the edge from BB to the block contianing the use.
|
|
|
|
|
|
|
|
|
|
This is same as in merge-phi code, but in slightly more general setting
|
|
|
|
|
because BB can have multiple successors. */
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
all_phis_safe_to_merge (basic_block bb)
|
|
|
|
|
{
|
|
|
|
|
gimple_stmt_iterator si;
|
|
|
|
|
bool ok = true;
|
|
|
|
|
|
|
|
|
|
for (si = gsi_start_phis (bb); !gsi_end_p (si); gsi_next (&si))
|
|
|
|
|
{
|
|
|
|
|
gimple phi = gsi_stmt (si);
|
|
|
|
|
tree result = gimple_phi_result (phi);
|
|
|
|
|
gimple stmt;
|
|
|
|
|
use_operand_p imm_use;
|
|
|
|
|
imm_use_iterator imm_iter;
|
|
|
|
|
|
|
|
|
|
/* If the PHI's result is never used, then we can just
|
|
|
|
|
ignore it. */
|
|
|
|
|
if (has_zero_uses (result))
|
|
|
|
|
continue;
|
|
|
|
|
/* We can always rebuild virtuals if needed. */
|
|
|
|
|
if (!is_gimple_reg (result))
|
|
|
|
|
continue;
|
|
|
|
|
FOR_EACH_IMM_USE_STMT (stmt, imm_iter, result)
|
|
|
|
|
{
|
|
|
|
|
if (gimple_code (stmt) != GIMPLE_PHI)
|
|
|
|
|
{
|
|
|
|
|
if (dump_file && (dump_flags & TDF_DETAILS))
|
|
|
|
|
fprintf (dump_file,
|
|
|
|
|
"PHI result has use in non-PHI statement.\n");
|
|
|
|
|
ok = false;
|
|
|
|
|
BREAK_FROM_IMM_USE_STMT (imm_iter);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
FOR_EACH_IMM_USE_ON_STMT (imm_use, imm_iter)
|
|
|
|
|
{
|
|
|
|
|
edge e;
|
|
|
|
|
e = gimple_phi_arg_edge (stmt, PHI_ARG_INDEX_FROM_USE (imm_use));
|
|
|
|
|
if (e->src != bb)
|
|
|
|
|
{
|
|
|
|
|
if (dump_file && (dump_flags & TDF_DETAILS))
|
|
|
|
|
fprintf (dump_file, "PHI has use in PHI not reached from"
|
|
|
|
|
"empty cleanup itself.\n");
|
|
|
|
|
ok = false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!ok)
|
|
|
|
|
BREAK_FROM_IMM_USE_STMT (imm_iter);
|
|
|
|
|
}
|
|
|
|
|
if (!ok)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return ok;
|
2009-03-29 15:32:13 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool dominance_info_invalidated;
|
|
|
|
|
|
2009-04-04 19:09:45 +02:00
|
|
|
|
/* Information to pass into make_eh_edge_and_update_phi. */
|
|
|
|
|
|
|
|
|
|
struct update_info
|
|
|
|
|
{
|
|
|
|
|
basic_block bb_to_remove, bb;
|
|
|
|
|
edge edge_to_remove;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* DATA points to update-info structure.
|
|
|
|
|
Like make_eh_edge create EH edge from DATA->bb to basic block containing
|
|
|
|
|
handler of REGION. In addition also update PHI operands by copying
|
|
|
|
|
operands from DATA->bb_to_remove. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
make_eh_edge_and_update_phi (struct eh_region *region, void *data)
|
|
|
|
|
{
|
|
|
|
|
struct update_info *info = (struct update_info *) data;
|
|
|
|
|
edge e, e2;
|
|
|
|
|
tree lab;
|
|
|
|
|
basic_block src, dst;
|
|
|
|
|
gimple_stmt_iterator si;
|
|
|
|
|
|
|
|
|
|
lab = get_eh_region_tree_label (region);
|
|
|
|
|
|
|
|
|
|
src = info->bb;
|
|
|
|
|
dst = label_to_block (lab);
|
|
|
|
|
|
|
|
|
|
e = find_edge (src, dst);
|
|
|
|
|
if (e)
|
|
|
|
|
{
|
|
|
|
|
gcc_assert (e->flags & EDGE_EH);
|
|
|
|
|
e->aux = e;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
dominance_info_invalidated = true;
|
|
|
|
|
e2 = find_edge (info->bb_to_remove, dst);
|
|
|
|
|
e = make_edge (src, dst, EDGE_ABNORMAL | EDGE_EH);
|
|
|
|
|
e->aux = e;
|
|
|
|
|
gcc_assert (e2);
|
|
|
|
|
for (si = gsi_start_phis (dst); !gsi_end_p (si); gsi_next (&si))
|
|
|
|
|
{
|
|
|
|
|
gimple phi = gsi_stmt (si);
|
|
|
|
|
tree use = USE_FROM_PTR (PHI_ARG_DEF_PTR_FROM_EDGE (phi, e2));
|
|
|
|
|
gimple def = (TREE_CODE (use) == SSA_NAME
|
|
|
|
|
? SSA_NAME_DEF_STMT (use) : NULL);
|
|
|
|
|
|
|
|
|
|
if (def && gimple_bb (def) == info->bb_to_remove)
|
|
|
|
|
{
|
|
|
|
|
use = USE_FROM_PTR (PHI_ARG_DEF_PTR_FROM_EDGE (def,
|
|
|
|
|
info->edge_to_remove));
|
|
|
|
|
gcc_assert (info->bb_to_remove == info->edge_to_remove->dest);
|
|
|
|
|
def = TREE_CODE (use) == SSA_NAME ? SSA_NAME_DEF_STMT (use) : NULL;
|
|
|
|
|
gcc_assert (!def
|
|
|
|
|
|| gimple_bb (def) != info->bb_to_remove
|
|
|
|
|
|| !is_gimple_reg (use));
|
|
|
|
|
}
|
|
|
|
|
SET_USE (PHI_ARG_DEF_PTR_FROM_EDGE (phi, e), use);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make EH edges corresponding to STMT while updating PHI nodes after removal
|
|
|
|
|
empty cleanup BB_TO_REMOVE joined to BB containing STMT
|
|
|
|
|
by EDGE_TO_REMOVE. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
update_eh_edges (gimple stmt, basic_block bb_to_remove, edge edge_to_remove)
|
|
|
|
|
{
|
|
|
|
|
int region_nr;
|
|
|
|
|
bool is_resx;
|
|
|
|
|
bool inlinable = false;
|
|
|
|
|
struct update_info info;
|
|
|
|
|
edge_iterator ei;
|
|
|
|
|
edge e;
|
|
|
|
|
int probability_sum = 0;
|
|
|
|
|
|
|
|
|
|
info.bb_to_remove = bb_to_remove;
|
|
|
|
|
info.bb = gimple_bb (stmt);
|
|
|
|
|
info.edge_to_remove = edge_to_remove;
|
|
|
|
|
|
|
|
|
|
if (gimple_code (stmt) == GIMPLE_RESX)
|
|
|
|
|
{
|
|
|
|
|
region_nr = gimple_resx_region (stmt);
|
|
|
|
|
is_resx = true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
region_nr = lookup_stmt_eh_region (stmt);
|
|
|
|
|
if (region_nr < 0)
|
|
|
|
|
return;
|
|
|
|
|
is_resx = false;
|
|
|
|
|
inlinable = inlinable_call_p (stmt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* First add new edges as neccesary. */
|
|
|
|
|
foreach_reachable_handler (region_nr, is_resx, inlinable,
|
|
|
|
|
make_eh_edge_and_update_phi, &info);
|
|
|
|
|
|
|
|
|
|
/* And remove edges we didn't marked. */
|
|
|
|
|
for (ei = ei_start (info.bb->succs); (e = ei_safe_edge (ei)); )
|
|
|
|
|
{
|
|
|
|
|
if ((e->flags & EDGE_EH) && !e->aux && e != edge_to_remove)
|
|
|
|
|
{
|
|
|
|
|
dominance_info_invalidated = true;
|
|
|
|
|
remove_edge (e);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
e->aux = NULL;
|
|
|
|
|
probability_sum += e->probability;
|
|
|
|
|
ei_next (&ei);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make CFG profile more consistent assuming that exception will resume to
|
|
|
|
|
first available EH handler. In practice this makes little difference, but
|
|
|
|
|
we get fewer consistency errors in the dumps. */
|
|
|
|
|
if (is_resx && EDGE_COUNT (info.bb->succs) && !probability_sum)
|
|
|
|
|
EDGE_SUCC (info.bb, 0)->probability = REG_BR_PROB_BASE;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-29 15:32:13 +02:00
|
|
|
|
/* Look for basic blocks containing empty exception handler and remove them.
|
|
|
|
|
This is similar to jump forwarding, just across EH edges. */
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
cleanup_empty_eh (basic_block bb)
|
|
|
|
|
{
|
|
|
|
|
int region;
|
2009-04-04 19:09:45 +02:00
|
|
|
|
gimple_stmt_iterator si;
|
2009-03-29 15:32:13 +02:00
|
|
|
|
|
|
|
|
|
/* When handler of EH region winds up to be empty, we can safely
|
|
|
|
|
remove it. This leads to inner EH regions to be redirected
|
|
|
|
|
to outer one, if present in function. So we need to rebuild
|
|
|
|
|
EH edges in all sources. */
|
2009-04-04 19:09:45 +02:00
|
|
|
|
if ((region = tree_empty_eh_handler_p (bb))
|
|
|
|
|
&& all_phis_safe_to_merge (bb))
|
2009-03-29 15:32:13 +02:00
|
|
|
|
{
|
|
|
|
|
edge e;
|
|
|
|
|
|
|
|
|
|
remove_eh_region (region);
|
|
|
|
|
|
|
|
|
|
while ((e = ei_safe_edge (ei_start (bb->preds))))
|
|
|
|
|
{
|
|
|
|
|
basic_block src = e->src;
|
|
|
|
|
gcc_assert (e->flags & EDGE_EH);
|
2009-04-04 19:09:45 +02:00
|
|
|
|
if (stmt_can_throw_internal (last_stmt (src)))
|
|
|
|
|
update_eh_edges (last_stmt (src), bb, e);
|
|
|
|
|
remove_edge (e);
|
|
|
|
|
}
|
|
|
|
|
if (dump_file)
|
|
|
|
|
fprintf (dump_file, "Empty EH handler %i removed\n", region);
|
|
|
|
|
|
|
|
|
|
/* Verify that we eliminated all uses of PHI we are going to remove.
|
|
|
|
|
If we didn't, rebuild SSA on affected variable (this is allowed only
|
|
|
|
|
for virtuals). */
|
|
|
|
|
for (si = gsi_start_phis (bb); !gsi_end_p (si); gsi_next (&si))
|
|
|
|
|
{
|
|
|
|
|
gimple phi = gsi_stmt (si);
|
|
|
|
|
tree result = gimple_phi_result (phi);
|
|
|
|
|
if (!has_zero_uses (result))
|
2009-03-29 15:32:13 +02:00
|
|
|
|
{
|
2009-04-04 19:09:45 +02:00
|
|
|
|
use_operand_p use_p;
|
|
|
|
|
imm_use_iterator iter;
|
|
|
|
|
gimple stmt;
|
|
|
|
|
|
|
|
|
|
FOR_EACH_IMM_USE_STMT (stmt, iter, result)
|
2009-03-29 15:32:13 +02:00
|
|
|
|
{
|
2009-04-04 19:09:45 +02:00
|
|
|
|
/* We have use, see if it won't disappear after
|
|
|
|
|
removing BB. */
|
|
|
|
|
if (gimple_bb (stmt) == bb)
|
|
|
|
|
continue;
|
|
|
|
|
if (gimple_code (stmt) == GIMPLE_PHI)
|
|
|
|
|
{
|
|
|
|
|
bool bad = false;
|
|
|
|
|
|
|
|
|
|
FOR_EACH_IMM_USE_ON_STMT (use_p, iter)
|
|
|
|
|
if (gimple_phi_arg_edge (stmt,
|
|
|
|
|
PHI_ARG_INDEX_FROM_USE (use_p))->src != bb)
|
|
|
|
|
{
|
|
|
|
|
bad = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!bad)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gcc_assert (!is_gimple_reg (result));
|
|
|
|
|
mark_sym_for_renaming (SSA_NAME_VAR (result));
|
|
|
|
|
/* As we are going to delete this block we will release all
|
|
|
|
|
defs which makes the immediate uses on use stmts invalid.
|
|
|
|
|
Avoid that by replacing all uses with the bare variable
|
|
|
|
|
and updating the stmts. */
|
|
|
|
|
FOR_EACH_IMM_USE_ON_STMT (use_p, iter)
|
|
|
|
|
SET_USE (use_p, SSA_NAME_VAR (result));
|
|
|
|
|
update_stmt (stmt);
|
2009-03-29 15:32:13 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
delete_basic_block (bb);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Perform cleanups and lowering of exception handling
|
|
|
|
|
1) cleanups regions with handlers doing nothing are optimized out
|
|
|
|
|
2) MUST_NOT_THROW regions that became dead because of 1) are optimized out
|
|
|
|
|
3) Info about regions that are containing instructions, and regions
|
|
|
|
|
reachable via local EH edges is collected
|
|
|
|
|
4) Eh tree is pruned for regions no longer neccesary.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
cleanup_eh (void)
|
|
|
|
|
{
|
|
|
|
|
bool changed = false;
|
|
|
|
|
basic_block bb;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (!cfun->eh)
|
|
|
|
|
return 0;
|
|
|
|
|
if (dump_file)
|
|
|
|
|
{
|
|
|
|
|
fprintf (dump_file, "Before cleanups:\n");
|
|
|
|
|
dump_eh_tree (dump_file, cfun);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dominance_info_invalidated = false;
|
|
|
|
|
/* We cannot use FOR_EACH_BB, since the basic blocks may get removed. */
|
|
|
|
|
for (i = NUM_FIXED_BLOCKS; i < last_basic_block; i++)
|
|
|
|
|
{
|
|
|
|
|
bb = BASIC_BLOCK (i);
|
|
|
|
|
if (bb)
|
|
|
|
|
changed |= cleanup_empty_eh (bb);
|
|
|
|
|
}
|
|
|
|
|
if (dominance_info_invalidated)
|
|
|
|
|
{
|
|
|
|
|
free_dominance_info (CDI_DOMINATORS);
|
|
|
|
|
free_dominance_info (CDI_POST_DOMINATORS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Removing contained cleanup can render MUST_NOT_THROW regions empty. */
|
|
|
|
|
if (changed)
|
|
|
|
|
delete_unreachable_blocks ();
|
|
|
|
|
|
|
|
|
|
tree_remove_unreachable_handlers ();
|
|
|
|
|
if (dump_file)
|
|
|
|
|
{
|
|
|
|
|
fprintf (dump_file, "After cleanups:\n");
|
|
|
|
|
dump_eh_tree (dump_file, cfun);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (changed ? TODO_cleanup_cfg | TODO_update_ssa : 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct gimple_opt_pass pass_cleanup_eh = {
|
|
|
|
|
{
|
|
|
|
|
GIMPLE_PASS,
|
|
|
|
|
"ehcleanup", /* name */
|
|
|
|
|
NULL, /* gate */
|
|
|
|
|
cleanup_eh, /* execute */
|
|
|
|
|
NULL, /* sub */
|
|
|
|
|
NULL, /* next */
|
|
|
|
|
0, /* static_pass_number */
|
|
|
|
|
TV_TREE_EH, /* tv_id */
|
|
|
|
|
PROP_gimple_lcf, /* properties_required */
|
|
|
|
|
0, /* properties_provided */
|
|
|
|
|
0, /* properties_destroyed */
|
|
|
|
|
0, /* todo_flags_start */
|
|
|
|
|
TODO_dump_func /* todo_flags_finish */
|
|
|
|
|
}
|
|
|
|
|
};
|