Mercurial > hg > CbC > CbC_gcc
diff gcc/tree-eh.c @ 111:04ced10e8804
gcc 7
| author | kono |
|---|---|
| date | Fri, 27 Oct 2017 22:46:09 +0900 |
| parents | f6334be47118 |
| children | 84e7813d76e9 |
line wrap: on
line diff
--- a/gcc/tree-eh.c Sun Aug 21 07:07:55 2011 +0900 +++ b/gcc/tree-eh.c Fri Oct 27 22:46:09 2017 +0900 @@ -1,6 +1,5 @@ /* Exception handling semantics and decomposition for trees. - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 2003-2017 Free Software Foundation, Inc. This file is part of GCC. @@ -21,59 +20,39 @@ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" +#include "backend.h" +#include "rtl.h" #include "tree.h" -#include "flags.h" -#include "function.h" +#include "gimple.h" +#include "cfghooks.h" +#include "tree-pass.h" +#include "ssa.h" +#include "cgraph.h" +#include "diagnostic-core.h" +#include "fold-const.h" +#include "calls.h" #include "except.h" -#include "pointer-set.h" -#include "tree-flow.h" -#include "tree-dump.h" +#include "cfganal.h" +#include "cfgcleanup.h" +#include "tree-eh.h" +#include "gimple-iterator.h" +#include "tree-cfg.h" +#include "tree-into-ssa.h" +#include "tree-ssa.h" #include "tree-inline.h" -#include "tree-iterator.h" -#include "tree-pass.h" -#include "timevar.h" #include "langhooks.h" -#include "ggc.h" -#include "diagnostic-core.h" -#include "gimple.h" -#include "target.h" +#include "cfgloop.h" +#include "gimple-low.h" +#include "stringpool.h" +#include "attribs.h" +#include "asan.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; - -/* 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; -} +typedef union {tree *tp; tree t; gimple *g;} treemple; /* Misc functions used in this file. */ -/* Compare and hash for any structure which begins with a canonical - pointer. Assumes all pointers are interchangeable, which is sort - of already assumed by gcc elsewhere IIRC. */ - -static int -struct_ptr_eq (const void *a, const void *b) -{ - const void * const * x = (const void * const *) a; - const void * const * y = (const void * const *) b; - return *x == *y; -} - -static hashval_t -struct_ptr_hash (const void *a) -{ - const void * const * x = (const void * const *) a; - return (size_t)*x >> 4; -} - - /* Remember and lookup EH landing pad 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: @@ -88,32 +67,21 @@ /* Add statement T in function IFUN to landing pad NUM. */ -void -add_stmt_to_eh_lp_fn (struct function *ifun, gimple t, int num) +static void +add_stmt_to_eh_lp_fn (struct function *ifun, gimple *t, int num) { - struct throw_stmt_node *n; - void **slot; - gcc_assert (num != 0); - n = ggc_alloc_throw_stmt_node (); - n->stmt = t; - n->lp_nr = num; - 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)); - - slot = htab_find_slot (get_eh_throw_stmt_table (ifun), n, INSERT); - gcc_assert (!*slot); - *slot = n; + set_eh_throw_stmt_table (ifun, hash_map<gimple *, int>::create_ggc (31)); + + gcc_assert (!get_eh_throw_stmt_table (ifun)->put (t, num)); } /* Add statement T in the current function (cfun) to EH landing pad NUM. */ void -add_stmt_to_eh_lp (gimple t, int num) +add_stmt_to_eh_lp (gimple *t, int num) { add_stmt_to_eh_lp_fn (cfun, t, num); } @@ -121,7 +89,7 @@ /* Add statement T to the single EH landing pad in REGION. */ static void -record_stmt_eh_region (eh_region region, gimple t) +record_stmt_eh_region (eh_region region, gimple *t) { if (region == NULL) return; @@ -142,24 +110,16 @@ /* Remove statement T in function IFUN from its EH landing pad. */ bool -remove_stmt_from_eh_lp_fn (struct function *ifun, gimple t) +remove_stmt_from_eh_lp_fn (struct function *ifun, gimple *t) { - struct throw_stmt_node dummy; - void **slot; - if (!get_eh_throw_stmt_table (ifun)) return false; - dummy.stmt = t; - slot = htab_find_slot (get_eh_throw_stmt_table (ifun), &dummy, - NO_INSERT); - if (slot) - { - htab_clear_slot (get_eh_throw_stmt_table (ifun), slot); + if (!get_eh_throw_stmt_table (ifun)->get (t)) + return false; + + get_eh_throw_stmt_table (ifun)->remove (t); return true; - } - else - return false; } @@ -167,7 +127,7 @@ EH landing pad. */ bool -remove_stmt_from_eh_lp (gimple t) +remove_stmt_from_eh_lp (gimple *t) { return remove_stmt_from_eh_lp_fn (cfun, t); } @@ -178,22 +138,19 @@ statement is not recorded in the region table. */ int -lookup_stmt_eh_lp_fn (struct function *ifun, gimple t) +lookup_stmt_eh_lp_fn (struct function *ifun, gimple *t) { - struct throw_stmt_node *p, n; - if (ifun->eh->throw_stmt_table == NULL) return 0; - n.stmt = t; - p = (struct throw_stmt_node *) htab_find (ifun->eh->throw_stmt_table, &n); - return p ? p->lp_nr : 0; + int *lp_nr = ifun->eh->throw_stmt_table->get (t); + return lp_nr ? *lp_nr : 0; } /* Likewise, but always use the current function. */ int -lookup_stmt_eh_lp (gimple t) +lookup_stmt_eh_lp (gimple *t) { /* We can get called from initialized data when -fnon-call-exceptions is on; prevent crash. */ @@ -213,35 +170,57 @@ tree) leaves the TRY block, its necessary to record a tree in this field. Thus a treemple is used. */ treemple child; - gimple parent; + gtry *parent; +}; + +/* Hashtable helpers. */ + +struct finally_tree_hasher : free_ptr_hash <finally_tree_node> +{ + static inline hashval_t hash (const finally_tree_node *); + static inline bool equal (const finally_tree_node *, + const finally_tree_node *); }; +inline hashval_t +finally_tree_hasher::hash (const finally_tree_node *v) +{ + return (intptr_t)v->child.t >> 4; +} + +inline bool +finally_tree_hasher::equal (const finally_tree_node *v, + const finally_tree_node *c) +{ + return v->child.t == c->child.t; +} + /* Note that this table is *not* marked GTY. It is short-lived. */ -static htab_t finally_tree; +static hash_table<finally_tree_hasher> *finally_tree; static void -record_in_finally_tree (treemple child, gimple parent) +record_in_finally_tree (treemple child, gtry *parent) { struct finally_tree_node *n; - void **slot; + finally_tree_node **slot; n = XNEW (struct finally_tree_node); n->child = child; n->parent = parent; - slot = htab_find_slot (finally_tree, n, INSERT); + slot = finally_tree->find_slot (n, INSERT); gcc_assert (!*slot); *slot = n; } static void -collect_finally_tree (gimple stmt, gimple region); +collect_finally_tree (gimple *stmt, gtry *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) +collect_finally_tree_1 (gimple_seq seq, gtry *region) { gimple_stmt_iterator gsi; @@ -250,14 +229,14 @@ } static void -collect_finally_tree (gimple stmt, gimple region) +collect_finally_tree (gimple *stmt, gtry *region) { treemple temp; switch (gimple_code (stmt)) { case GIMPLE_LABEL: - temp.t = gimple_label_label (stmt); + temp.t = gimple_label_label (as_a <glabel *> (stmt)); record_in_finally_tree (temp, region); break; @@ -266,7 +245,8 @@ { temp.g = stmt; record_in_finally_tree (temp, region); - collect_finally_tree_1 (gimple_try_eval (stmt), stmt); + collect_finally_tree_1 (gimple_try_eval (stmt), + as_a <gtry *> (stmt)); collect_finally_tree_1 (gimple_try_cleanup (stmt), region); } else if (gimple_try_kind (stmt) == GIMPLE_TRY_CATCH) @@ -277,13 +257,23 @@ break; case GIMPLE_CATCH: - collect_finally_tree_1 (gimple_catch_handler (stmt), region); + collect_finally_tree_1 (gimple_catch_handler ( + as_a <gcatch *> (stmt)), + region); break; case GIMPLE_EH_FILTER: collect_finally_tree_1 (gimple_eh_filter_failure (stmt), region); break; + case GIMPLE_EH_ELSE: + { + geh_else *eh_else_stmt = as_a <geh_else *> (stmt); + collect_finally_tree_1 (gimple_eh_else_n_body (eh_else_stmt), region); + collect_finally_tree_1 (gimple_eh_else_e_body (eh_else_stmt), region); + } + break; + default: /* A type, a decl, or some kind of statement that we're not interested in. Don't walk them. */ @@ -296,14 +286,14 @@ would leave the try_finally node that START lives in. */ static bool -outside_finally_tree (treemple start, gimple target) +outside_finally_tree (treemple start, gimple *target) { struct finally_tree_node n, *p; do { n.child = start; - p = (struct finally_tree_node *) htab_find (finally_tree, &n); + p = finally_tree->find (&n); if (!p) return true; start.g = p->parent; @@ -326,7 +316,7 @@ indexed by EH region number. */ static bitmap eh_region_may_contain_throw_map; -/* The GOTO_QUEUE is is an array of GIMPLE_GOTO and GIMPLE_RETURN +/* The GOTO_QUEUE 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 @@ -338,8 +328,9 @@ struct goto_queue_node { treemple stmt; + location_t location; gimple_seq repl_stmt; - gimple cont_stmt; + gimple *cont_stmt; int index; /* This is used when index >= 0 to indicate that stmt is a label (as opposed to a goto stmt). */ @@ -372,8 +363,8 @@ 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; + gtry *try_finally_expr; + gtry *top_p; /* While lowering a top_p usually it is expanded into multiple statements, thus we need the following field to store them. */ @@ -391,10 +382,10 @@ size_t goto_queue_active; /* Pointer map to help in searching goto_queue when it is large. */ - struct pointer_map_t *goto_queue_map; + hash_map<gimple *, goto_queue_node *> *goto_queue_map; /* The set of unique labels seen as entries in the goto queue. */ - VEC(tree,heap) *dest_array; + vec<tree> dest_array; /* 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*, @@ -413,20 +404,19 @@ bool may_throw; }; -static gimple_seq lower_eh_must_not_throw (struct leh_state *, gimple); +static gimple_seq lower_eh_must_not_throw (struct leh_state *, gtry *); /* Search for STMT in the goto queue. Return the replacement, or null if the statement isn't in the queue. */ #define LARGE_GOTO_QUEUE 20 -static void lower_eh_constructs_1 (struct leh_state *state, gimple_seq seq); +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) { unsigned int i; - void **slot; if (tf->goto_queue_active < LARGE_GOTO_QUEUE) { @@ -441,19 +431,18 @@ if (!tf->goto_queue_map) { - tf->goto_queue_map = pointer_map_create (); + tf->goto_queue_map = new hash_map<gimple *, goto_queue_node *>; for (i = 0; i < tf->goto_queue_active; i++) { - slot = pointer_map_insert (tf->goto_queue_map, - tf->goto_queue[i].stmt.g); - gcc_assert (*slot == NULL); - *slot = &tf->goto_queue[i]; + bool existed = tf->goto_queue_map->put (tf->goto_queue[i].stmt.g, + &tf->goto_queue[i]); + gcc_assert (!existed); } } - slot = pointer_map_contains (tf->goto_queue_map, stmt.g); + goto_queue_node **slot = tf->goto_queue_map->get (stmt.g); if (slot != NULL) - return (((struct goto_queue_node *) *slot)->repl_stmt); + return ((*slot)->repl_stmt); return NULL; } @@ -495,10 +484,10 @@ /* The real work of replace_goto_queue. Returns with TSI updated to point to the next statement. */ -static void replace_goto_queue_stmt_list (gimple_seq, struct leh_tf_state *); +static void replace_goto_queue_stmt_list (gimple_seq *, struct leh_tf_state *); static void -replace_goto_queue_1 (gimple stmt, struct leh_tf_state *tf, +replace_goto_queue_1 (gimple *stmt, struct leh_tf_state *tf, gimple_stmt_iterator *gsi) { gimple_seq seq; @@ -525,14 +514,25 @@ break; case GIMPLE_TRY: - replace_goto_queue_stmt_list (gimple_try_eval (stmt), tf); - replace_goto_queue_stmt_list (gimple_try_cleanup (stmt), tf); + replace_goto_queue_stmt_list (gimple_try_eval_ptr (stmt), tf); + replace_goto_queue_stmt_list (gimple_try_cleanup_ptr (stmt), tf); break; case GIMPLE_CATCH: - replace_goto_queue_stmt_list (gimple_catch_handler (stmt), tf); + replace_goto_queue_stmt_list (gimple_catch_handler_ptr ( + as_a <gcatch *> (stmt)), + tf); break; case GIMPLE_EH_FILTER: - replace_goto_queue_stmt_list (gimple_eh_filter_failure (stmt), tf); + replace_goto_queue_stmt_list (gimple_eh_filter_failure_ptr (stmt), tf); + break; + case GIMPLE_EH_ELSE: + { + geh_else *eh_else_stmt = as_a <geh_else *> (stmt); + replace_goto_queue_stmt_list (gimple_eh_else_n_body_ptr (eh_else_stmt), + tf); + replace_goto_queue_stmt_list (gimple_eh_else_e_body_ptr (eh_else_stmt), + tf); + } break; default: @@ -546,9 +546,9 @@ /* A subroutine of replace_goto_queue. Handles GIMPLE_SEQ. */ static void -replace_goto_queue_stmt_list (gimple_seq seq, struct leh_tf_state *tf) +replace_goto_queue_stmt_list (gimple_seq *seq, struct leh_tf_state *tf) { - gimple_stmt_iterator gsi = gsi_start (seq); + gimple_stmt_iterator gsi = gsi_start (*seq); while (!gsi_end_p (gsi)) replace_goto_queue_1 (gsi_stmt (gsi), tf, &gsi); @@ -561,8 +561,8 @@ { if (tf->goto_queue_active == 0) return; - replace_goto_queue_stmt_list (tf->top_p_seq, tf); - replace_goto_queue_stmt_list (eh_seq, tf); + replace_goto_queue_stmt_list (&tf->top_p_seq, tf); + replace_goto_queue_stmt_list (&eh_seq, tf); } /* Add a new record to the goto queue contained in TF. NEW_STMT is the @@ -573,7 +573,8 @@ record_in_goto_queue (struct leh_tf_state *tf, treemple new_stmt, int index, - bool is_label) + bool is_label, + location_t location) { size_t active, size; struct goto_queue_node *q; @@ -596,6 +597,7 @@ memset (q, 0, sizeof (*q)); q->stmt = new_stmt; q->index = index; + q->location = location; q->is_label = is_label; } @@ -603,7 +605,8 @@ TF is not null. */ static void -record_in_goto_queue_label (struct leh_tf_state *tf, treemple stmt, tree label) +record_in_goto_queue_label (struct leh_tf_state *tf, treemple stmt, tree label, + location_t location) { int index; treemple temp, new_stmt; @@ -622,27 +625,27 @@ if (!outside_finally_tree (temp, tf->try_finally_expr)) return; - if (! tf->dest_array) + if (! tf->dest_array.exists ()) { - tf->dest_array = VEC_alloc (tree, heap, 10); - VEC_quick_push (tree, tf->dest_array, label); + tf->dest_array.create (10); + tf->dest_array.quick_push (label); index = 0; } else { - int n = VEC_length (tree, tf->dest_array); + int n = tf->dest_array.length (); for (index = 0; index < n; ++index) - if (VEC_index (tree, tf->dest_array, index) == label) + if (tf->dest_array[index] == label) break; if (index == n) - VEC_safe_push (tree, heap, tf->dest_array, label); + tf->dest_array.safe_push (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); + record_in_goto_queue (tf, new_stmt, index, true, location); } /* For any GIMPLE_GOTO or GIMPLE_RETURN, decide whether it leaves a try_finally @@ -650,7 +653,7 @@ try_finally node. */ static void -maybe_record_in_goto_queue (struct leh_state *state, gimple stmt) +maybe_record_in_goto_queue (struct leh_state *state, gimple *stmt) { struct leh_tf_state *tf = state->tf; treemple new_stmt; @@ -661,20 +664,28 @@ 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)); + { + gcond *cond_stmt = as_a <gcond *> (stmt); + new_stmt.tp = gimple_op_ptr (cond_stmt, 2); + record_in_goto_queue_label (tf, new_stmt, + gimple_cond_true_label (cond_stmt), + EXPR_LOCATION (*new_stmt.tp)); + new_stmt.tp = gimple_op_ptr (cond_stmt, 3); + record_in_goto_queue_label (tf, new_stmt, + gimple_cond_false_label (cond_stmt), + EXPR_LOCATION (*new_stmt.tp)); + } break; case GIMPLE_GOTO: new_stmt.g = stmt; - record_in_goto_queue_label (tf, new_stmt, gimple_goto_dest (stmt)); + record_in_goto_queue_label (tf, new_stmt, gimple_goto_dest (stmt), + gimple_location (stmt)); break; case GIMPLE_RETURN: tf->may_return = true; new_stmt.g = stmt; - record_in_goto_queue (tf, new_stmt, -1, false); + record_in_goto_queue (tf, new_stmt, -1, false, gimple_location (stmt)); break; default: @@ -683,13 +694,14 @@ } -#ifdef ENABLE_CHECKING +#if CHECKING_P /* We do not process GIMPLE_SWITCHes for now. As long as the original source was in fact structured, and we've not yet done jump threading, then none of the labels will leave outer GIMPLE_TRY_FINALLY nodes. Verify this. */ static void -verify_norecord_switch_expr (struct leh_state *state, gimple switch_expr) +verify_norecord_switch_expr (struct leh_state *state, + gswitch *switch_expr) { struct leh_tf_state *tf = state->tf; size_t i, n; @@ -711,74 +723,41 @@ #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 - variable to be used in manipulating the value returned from the function. */ +/* Redirect a RETURN_EXPR pointed to by Q to FINLAB. If MOD is + non-null, insert it before the new branch. */ static void -do_return_redirection (struct goto_queue_node *q, tree finlab, gimple_seq mod, - tree *return_value_p) +do_return_redirection (struct goto_queue_node *q, tree finlab, gimple_seq mod) { - tree ret_expr; - gimple x; - - /* In the case of a return, the queue node must be a gimple statement. */ + 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); - - if (ret_expr) - { - if (!*return_value_p) - *return_value_p = ret_expr; - else - gcc_assert (*return_value_p == ret_expr); - q->cont_stmt = q->stmt.g; - /* 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. */ - - if (TREE_CODE (ret_expr) == RESULT_DECL) + /* Note that the return value may have already been computed, e.g., + + int x; + int foo (void) { - if (!*return_value_p) - *return_value_p = ret_expr; - else - gcc_assert (*return_value_p == ret_expr); - q->cont_stmt = q->stmt.g; + x = 0; + try { + return x; + } finally { + x++; + } } - else - gcc_unreachable (); - } - else - /* If we don't return a value, all return statements are the same. */ - q->cont_stmt = q->stmt.g; - - if (!q->repl_stmt) - q->repl_stmt = gimple_seq_alloc (); + + should return 0, not 1. We don't have to do anything to make + this happens because the return value has been placed in the + RESULT_DECL already. */ + + q->cont_stmt = q->stmt.g; if (mod) gimple_seq_add_seq (&q->repl_stmt, mod); x = gimple_build_goto (finlab); + gimple_set_location (x, q->location); gimple_seq_add_stmt (&q->repl_stmt, x); } @@ -788,18 +767,17 @@ do_goto_redirection (struct goto_queue_node *q, tree finlab, gimple_seq mod, struct leh_tf_state *tf) { - gimple x; + ggoto *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)); + + q->cont_stmt = gimple_build_goto (tf->dest_array[q->index]); if (mod) gimple_seq_add_seq (&q->repl_stmt, mod); x = gimple_build_goto (finlab); + gimple_set_location (x, q->location); gimple_seq_add_stmt (&q->repl_stmt, x); } @@ -809,7 +787,7 @@ emit_post_landing_pad (gimple_seq *seq, eh_region region) { eh_landing_pad lp = region->landing_pads; - gimple x; + glabel *x; if (lp == NULL) lp = gen_eh_landing_pad (region); @@ -826,7 +804,7 @@ static void emit_resx (gimple_seq *seq, eh_region region) { - gimple x = gimple_build_resx (region->index); + gresx *x = gimple_build_resx (region->index); gimple_seq_add_stmt (seq, x); if (region->outer) record_stmt_eh_region (region->outer, x); @@ -837,7 +815,7 @@ static void emit_eh_dispatch (gimple_seq *seq, eh_region region) { - gimple x = gimple_build_eh_dispatch (region->index); + geh_dispatch *x = gimple_build_eh_dispatch (region->index); gimple_seq_add_stmt (seq, x); } @@ -849,6 +827,8 @@ { while (bitmap_set_bit (eh_region_may_contain_throw_map, region->index)) { + if (region->type == ERT_MUST_NOT_THROW) + break; region = region->outer; if (region == NULL) break; @@ -867,10 +847,10 @@ /* We want to transform try { body; } catch { stuff; } to - normal_seqence: + normal_sequence: body; over: - eh_seqence: + eh_sequence: landing_pad: stuff; goto over; @@ -880,9 +860,9 @@ an existing label that should be put at the exit, or NULL. */ static gimple_seq -frob_into_branch_around (gimple tp, eh_region region, tree over) +frob_into_branch_around (gtry *tp, eh_region region, tree over) { - gimple x; + gimple *x; gimple_seq cleanup, result; location_t loc = gimple_location (tp); @@ -897,6 +877,7 @@ if (!over) over = create_artificial_label (loc); x = gimple_build_goto (over); + gimple_set_location (x, loc); gimple_seq_add_stmt (&cleanup, x); } gimple_seq_add_seq (&eh_seq, cleanup); @@ -913,13 +894,31 @@ Make sure to record all new labels found. */ static gimple_seq -lower_try_finally_dup_block (gimple_seq seq, struct leh_state *outer_state) +lower_try_finally_dup_block (gimple_seq seq, struct leh_state *outer_state, + location_t loc) { - gimple region = NULL; + gtry *region = NULL; gimple_seq new_seq; + gimple_stmt_iterator gsi; new_seq = copy_gimple_seq_and_replace_locals (seq); + for (gsi = gsi_start (new_seq); !gsi_end_p (gsi); gsi_next (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + /* We duplicate __builtin_stack_restore at -O0 in the hope of eliminating + it on the EH paths. When it is not eliminated, make it transparent in + the debug info. */ + if (gimple_call_builtin_p (stmt, BUILT_IN_STACK_RESTORE)) + gimple_set_location (stmt, UNKNOWN_LOCATION); + else if (LOCATION_LOCUS (gimple_location (stmt)) == UNKNOWN_LOCATION) + { + tree block = gimple_block (stmt); + gimple_set_location (stmt, loc); + gimple_set_block (stmt, block); + } + } + if (outer_state->tf) region = outer_state->tf->try_finally_expr; collect_finally_tree_1 (new_seq, region); @@ -950,6 +949,21 @@ return label; } +/* A subroutine of lower_try_finally. If FINALLY consits of a + GIMPLE_EH_ELSE node, return it. */ + +static inline geh_else * +get_eh_else (gimple_seq finally) +{ + gimple *x = gimple_seq_first_stmt (finally); + if (gimple_code (x) == GIMPLE_EH_ELSE) + { + gcc_assert (gimple_seq_singleton_p (finally)); + return as_a <geh_else *> (x); + } + return NULL; +} + /* A subroutine of lower_try_finally. If the eh_protect_cleanup_actions langhook returns non-null, then the language requires that the exception path out of a try_finally be treated specially. To wit: the code within @@ -975,54 +989,65 @@ struct leh_state *this_state, struct leh_tf_state *tf) { - tree protect_cleanup_actions; - gimple_stmt_iterator gsi; - bool finally_may_fallthru; - gimple_seq finally; - gimple x; - - /* First check for nothing to do. */ - if (lang_hooks.eh_protect_cleanup_actions == NULL) - return; - protect_cleanup_actions = lang_hooks.eh_protect_cleanup_actions (); - if (protect_cleanup_actions == NULL) - return; - - finally = gimple_try_cleanup (tf->top_p); - finally_may_fallthru = gimple_seq_may_fallthru (finally); - - /* 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); - - /* 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. */ - gsi = gsi_start (finally); - x = gsi_stmt (gsi); - if (gimple_code (x) == GIMPLE_TRY - && gimple_try_kind (x) == GIMPLE_TRY_CATCH - && gimple_try_catch_is_cleanup (x)) + gimple_seq finally = gimple_try_cleanup (tf->top_p); + + /* EH_ELSE doesn't come from user code; only compiler generated stuff. + It does need to be handled here, so as to separate the (different) + EH path from the normal path. But we should not attempt to wrap + it with a must-not-throw node (which indeed gets in the way). */ + if (geh_else *eh_else = get_eh_else (finally)) + { + gimple_try_set_cleanup (tf->top_p, gimple_eh_else_n_body (eh_else)); + finally = gimple_eh_else_e_body (eh_else); + + /* Let the ELSE see the exception that's being processed. */ + eh_region save_ehp = this_state->ehp_region; + this_state->ehp_region = this_state->cur_region; + lower_eh_constructs_1 (this_state, &finally); + this_state->ehp_region = save_ehp; + } + else { - gsi_insert_seq_before (&gsi, gimple_try_eval (x), GSI_SAME_STMT); - gsi_remove (&gsi, false); + /* First check for nothing to do. */ + if (lang_hooks.eh_protect_cleanup_actions == NULL) + return; + tree actions = lang_hooks.eh_protect_cleanup_actions (); + if (actions == NULL) + return; + + if (this_state) + finally = lower_try_finally_dup_block (finally, outer_state, + gimple_location (tf->try_finally_expr)); + + /* 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. */ + gimple_stmt_iterator gsi = gsi_start (finally); + gimple *x = gsi_stmt (gsi); + if (gimple_code (x) == GIMPLE_TRY + && gimple_try_kind (x) == GIMPLE_TRY_CATCH + && gimple_try_catch_is_cleanup (x)) + { + gsi_insert_seq_before (&gsi, gimple_try_eval (x), GSI_SAME_STMT); + gsi_remove (&gsi, false); + } + + /* Wrap the block with protect_cleanup_actions as the action. */ + geh_mnt *eh_mnt = gimple_build_eh_must_not_throw (actions); + gtry *try_stmt = gimple_build_try (finally, + gimple_seq_alloc_with_stmt (eh_mnt), + GIMPLE_TRY_CATCH); + finally = lower_eh_must_not_throw (outer_state, try_stmt); } - /* Wrap the block with protect_cleanup_actions as the action. */ - x = gimple_build_eh_must_not_throw (protect_cleanup_actions); - x = gimple_build_try (finally, gimple_seq_alloc_with_stmt (x), - GIMPLE_TRY_CATCH); - finally = lower_eh_must_not_throw (outer_state, x); - /* Drop all of this into the exception sequence. */ emit_post_landing_pad (&eh_seq, tf->region); gimple_seq_add_seq (&eh_seq, finally); - if (finally_may_fallthru) + if (gimple_seq_may_fallthru (finally)) emit_resx (&eh_seq, tf->region); /* Having now been handled, EH isn't to be considered with @@ -1039,8 +1064,9 @@ lower_try_finally_nofallthru (struct leh_state *state, struct leh_tf_state *tf) { - tree lab, return_val; - gimple x; + tree lab; + gimple *x; + geh_else *eh_else; gimple_seq finally; struct goto_queue_node *q, *qe; @@ -1053,26 +1079,46 @@ x = gimple_build_label (lab); gimple_seq_add_stmt (&tf->top_p_seq, x); - 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); + do_return_redirection (q, lab, NULL); else do_goto_redirection (q, lab, NULL, tf); replace_goto_queue (tf); - lower_eh_constructs_1 (state, finally); - gimple_seq_add_seq (&tf->top_p_seq, finally); - - if (tf->may_throw) + /* Emit the finally block into the stream. Lower EH_ELSE at this time. */ + eh_else = get_eh_else (finally); + if (eh_else) { - emit_post_landing_pad (&eh_seq, tf->region); - - x = gimple_build_goto (lab); - gimple_seq_add_stmt (&eh_seq, x); + finally = gimple_eh_else_n_body (eh_else); + lower_eh_constructs_1 (state, &finally); + gimple_seq_add_seq (&tf->top_p_seq, finally); + + if (tf->may_throw) + { + finally = gimple_eh_else_e_body (eh_else); + lower_eh_constructs_1 (state, &finally); + + emit_post_landing_pad (&eh_seq, tf->region); + gimple_seq_add_seq (&eh_seq, finally); + } + } + else + { + lower_eh_constructs_1 (state, &finally); + gimple_seq_add_seq (&tf->top_p_seq, finally); + + if (tf->may_throw) + { + emit_post_landing_pad (&eh_seq, tf->region); + + x = gimple_build_goto (lab); + gimple_set_location (x, gimple_location (tf->try_finally_expr)); + gimple_seq_add_stmt (&eh_seq, x); + } } } @@ -1084,15 +1130,41 @@ lower_try_finally_onedest (struct leh_state *state, struct leh_tf_state *tf) { struct goto_queue_node *q, *qe; - gimple x; + geh_else *eh_else; + glabel *label_stmt; + gimple *x; gimple_seq finally; + gimple_stmt_iterator gsi; tree finally_label; location_t loc = gimple_location (tf->try_finally_expr); finally = gimple_try_cleanup (tf->top_p); tf->top_p_seq = gimple_try_eval (tf->top_p); - lower_eh_constructs_1 (state, finally); + /* Since there's only one destination, and the destination edge can only + either be EH or non-EH, that implies that all of our incoming edges + are of the same type. Therefore we can lower EH_ELSE immediately. */ + eh_else = get_eh_else (finally); + if (eh_else) + { + if (tf->may_throw) + finally = gimple_eh_else_e_body (eh_else); + else + finally = gimple_eh_else_n_body (eh_else); + } + + lower_eh_constructs_1 (state, &finally); + + for (gsi = gsi_start (finally); !gsi_end_p (gsi); gsi_next (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + if (LOCATION_LOCUS (gimple_location (stmt)) == UNKNOWN_LOCATION) + { + tree block = gimple_block (stmt); + gimple_set_location (stmt, gimple_location (tf->try_finally_expr)); + gimple_set_block (stmt, block); + } + } if (tf->may_throw) { @@ -1113,8 +1185,8 @@ } finally_label = create_artificial_label (loc); - x = gimple_build_label (finally_label); - gimple_seq_add_stmt (&tf->top_p_seq, x); + label_stmt = gimple_build_label (finally_label); + gimple_seq_add_stmt (&tf->top_p_seq, label_stmt); gimple_seq_add_seq (&tf->top_p_seq, finally); @@ -1124,9 +1196,8 @@ 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); + do_return_redirection (q, finally_label, NULL); replace_goto_queue (tf); } else @@ -1136,7 +1207,7 @@ do_goto_redirection (q, finally_label, NULL, tf); replace_goto_queue (tf); - if (VEC_index (tree, tf->dest_array, 0) == tf->fallthru_label) + if (tf->dest_array[0] == tf->fallthru_label) { /* Reachable by goto to fallthru label only. Redirect it to the new label (already created, sadly), and do not @@ -1163,29 +1234,43 @@ gimple_seq finally; gimple_seq new_stmt; gimple_seq seq; - gimple x; + gimple *x; + geh_else *eh_else; tree tmp; location_t tf_loc = gimple_location (tf->try_finally_expr); finally = gimple_try_cleanup (tf->top_p); + + /* Notice EH_ELSE, and simplify some of the remaining code + by considering FINALLY to be the normal return path only. */ + eh_else = get_eh_else (finally); + if (eh_else) + finally = gimple_eh_else_n_body (eh_else); + tf->top_p_seq = gimple_try_eval (tf->top_p); new_stmt = NULL; if (tf->may_fallthru) { - seq = lower_try_finally_dup_block (finally, state); - lower_eh_constructs_1 (state, seq); + seq = lower_try_finally_dup_block (finally, state, tf_loc); + lower_eh_constructs_1 (state, &seq); gimple_seq_add_seq (&new_stmt, seq); tmp = lower_try_finally_fallthru_label (tf); x = gimple_build_goto (tmp); + gimple_set_location (x, tf_loc); gimple_seq_add_stmt (&new_stmt, x); } if (tf->may_throw) { - seq = lower_try_finally_dup_block (finally, state); - lower_eh_constructs_1 (state, seq); + /* We don't need to copy the EH path of EH_ELSE, + since it is only emitted once. */ + if (eh_else) + seq = gimple_eh_else_e_body (eh_else); + else + seq = lower_try_finally_dup_block (finally, state, tf_loc); + lower_eh_constructs_1 (state, &seq); emit_post_landing_pad (&eh_seq, tf->region); gimple_seq_add_seq (&eh_seq, seq); @@ -1195,7 +1280,6 @@ if (tf->goto_queue) { struct goto_queue_node *q, *qe; - tree return_val = NULL; int return_index, index; struct labels_s { @@ -1203,7 +1287,7 @@ tree label; } *labels; - return_index = VEC_length (tree, tf->dest_array); + return_index = tf->dest_array.length (); labels = XCNEWVEC (struct labels_s, return_index + 1); q = tf->goto_queue; @@ -1228,15 +1312,15 @@ = create_artificial_label (tf_loc); if (index == return_index) - do_return_redirection (q, lab, NULL, &return_val); + do_return_redirection (q, lab, NULL); else do_goto_redirection (q, lab, NULL, tf); x = gimple_build_label (lab); gimple_seq_add_stmt (&new_stmt, x); - seq = lower_try_finally_dup_block (finally, state); - lower_eh_constructs_1 (state, seq); + seq = lower_try_finally_dup_block (finally, state, q->location); + lower_eh_constructs_1 (state, &seq); gimple_seq_add_seq (&new_stmt, seq); gimple_seq_add_stmt (&new_stmt, q->cont_stmt); @@ -1255,7 +1339,7 @@ lab = labels[index].label; if (index == return_index) - do_return_redirection (q, lab, NULL, &return_val); + do_return_redirection (q, lab, NULL); else do_goto_redirection (q, lab, NULL, tf); } @@ -1278,69 +1362,67 @@ lower_try_finally_switch (struct leh_state *state, struct leh_tf_state *tf) { struct goto_queue_node *q, *qe; - tree return_val = NULL; tree finally_tmp, finally_label; int return_index, eh_index, fallthru_index; int nlabels, ndests, j, last_case_index; tree last_case; - VEC (tree,heap) *case_label_vec; - gimple_seq switch_body; - gimple x; + auto_vec<tree> case_label_vec; + gimple_seq switch_body = NULL; + gimple *x; + geh_else *eh_else; tree tmp; - gimple switch_stmt; + gimple *switch_stmt; gimple_seq finally; - struct pointer_map_t *cont_map = NULL; + hash_map<tree, gimple *> *cont_map = NULL; /* The location of the TRY_FINALLY stmt. */ location_t tf_loc = gimple_location (tf->try_finally_expr); /* The location of the finally block. */ location_t finally_loc; - switch_body = gimple_seq_alloc (); + finally = gimple_try_cleanup (tf->top_p); + eh_else = get_eh_else (finally); /* Mash the TRY block to the head of the chain. */ - finally = gimple_try_cleanup (tf->top_p); tf->top_p_seq = gimple_try_eval (tf->top_p); /* The location of the finally is either the last stmt in the finally block or the location of the TRY_FINALLY itself. */ - finally_loc = gimple_seq_last_stmt (tf->top_p_seq) != NULL ? - gimple_location (gimple_seq_last_stmt (tf->top_p_seq)) - : tf_loc; - - /* Lower the finally block itself. */ - lower_eh_constructs_1 (state, finally); + x = gimple_seq_last_stmt (finally); + finally_loc = x ? gimple_location (x) : tf_loc; /* Prepare for switch statement generation. */ - nlabels = VEC_length (tree, tf->dest_array); + nlabels = tf->dest_array.length (); return_index = nlabels; eh_index = return_index + tf->may_return; - fallthru_index = eh_index + tf->may_throw; + fallthru_index = eh_index + (tf->may_throw && !eh_else); ndests = fallthru_index + tf->may_fallthru; finally_tmp = create_tmp_var (integer_type_node, "finally_tmp"); finally_label = create_artificial_label (finally_loc); - /* We use VEC_quick_push on case_label_vec throughout this function, + /* 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); + case_label_vec.create (ndests); 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. */ + laid out. */ if (tf->may_fallthru) { x = gimple_build_assign (finally_tmp, - build_int_cst (NULL, fallthru_index)); + build_int_cst (integer_type_node, + fallthru_index)); + gimple_set_location (x, finally_loc); gimple_seq_add_stmt (&tf->top_p_seq, x); - last_case = build3 (CASE_LABEL_EXPR, void_type_node, - build_int_cst (NULL, fallthru_index), - NULL, create_artificial_label (tf_loc)); - VEC_quick_push (tree, case_label_vec, last_case); + tmp = build_int_cst (integer_type_node, fallthru_index); + last_case = build_case_label (tmp, NULL, + create_artificial_label (finally_loc)); + case_label_vec.quick_push (last_case); last_case_index++; x = gimple_build_label (CASE_LABEL (last_case)); @@ -1348,24 +1430,42 @@ tmp = lower_try_finally_fallthru_label (tf); x = gimple_build_goto (tmp); + gimple_set_location (x, finally_loc); gimple_seq_add_stmt (&switch_body, x); } - if (tf->may_throw) + /* For EH_ELSE, emit the exception path (plus resx) now, then + subsequently we only need consider the normal path. */ + if (eh_else) + { + if (tf->may_throw) + { + finally = gimple_eh_else_e_body (eh_else); + lower_eh_constructs_1 (state, &finally); + + emit_post_landing_pad (&eh_seq, tf->region); + gimple_seq_add_seq (&eh_seq, finally); + emit_resx (&eh_seq, tf->region); + } + + finally = gimple_eh_else_n_body (eh_else); + } + else if (tf->may_throw) { emit_post_landing_pad (&eh_seq, tf->region); x = gimple_build_assign (finally_tmp, - build_int_cst (NULL, eh_index)); + build_int_cst (integer_type_node, eh_index)); gimple_seq_add_stmt (&eh_seq, x); x = gimple_build_goto (finally_label); + gimple_set_location (x, tf_loc); gimple_seq_add_stmt (&eh_seq, x); - last_case = build3 (CASE_LABEL_EXPR, void_type_node, - build_int_cst (NULL, eh_index), - NULL, create_artificial_label (tf_loc)); - VEC_quick_push (tree, case_label_vec, last_case); + tmp = build_int_cst (integer_type_node, eh_index); + last_case = build_case_label (tmp, NULL, + create_artificial_label (tf_loc)); + case_label_vec.quick_push (last_case); last_case_index++; x = gimple_build_label (CASE_LABEL (last_case)); @@ -1376,6 +1476,7 @@ x = gimple_build_label (finally_label); gimple_seq_add_stmt (&tf->top_p_seq, x); + lower_eh_constructs_1 (state, &finally); gimple_seq_add_seq (&tf->top_p_seq, finally); /* Redirect each incoming goto edge. */ @@ -1386,88 +1487,75 @@ entrance through a particular edge. */ for (; q < qe; ++q) { - gimple_seq mod; + gimple_seq mod = NULL; int switch_id; unsigned int case_index; - mod = gimple_seq_alloc (); - if (q->index < 0) { x = gimple_build_assign (finally_tmp, - build_int_cst (NULL, return_index)); + build_int_cst (integer_type_node, + return_index)); gimple_seq_add_stmt (&mod, x); - do_return_redirection (q, finally_label, mod, &return_val); + do_return_redirection (q, finally_label, mod); switch_id = return_index; } else { x = gimple_build_assign (finally_tmp, - build_int_cst (NULL, q->index)); + build_int_cst (integer_type_node, q->index)); gimple_seq_add_stmt (&mod, x); do_goto_redirection (q, finally_label, mod, tf); switch_id = q->index; } case_index = j + q->index; - if (VEC_length (tree, case_label_vec) <= case_index - || !VEC_index (tree, case_label_vec, case_index)) + if (case_label_vec.length () <= case_index || !case_label_vec[case_index]) { tree case_lab; - void **slot; - case_lab = build3 (CASE_LABEL_EXPR, void_type_node, - build_int_cst (NULL, switch_id), - NULL, NULL); + tmp = build_int_cst (integer_type_node, switch_id); + case_lab = build_case_label (tmp, NULL, + create_artificial_label (tf_loc)); /* 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. */ + it in the loop below. */ 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); + cont_map = new hash_map<tree, gimple *>; + cont_map->put (case_lab, q->cont_stmt); + case_label_vec.quick_push (case_lab); } } for (j = last_case_index; j < last_case_index + nlabels; j++) { - tree label; - gimple cont_stmt; - void **slot; - - last_case = VEC_index (tree, case_label_vec, j); + gimple *cont_stmt; + + last_case = case_label_vec[j]; gcc_assert (last_case); gcc_assert (cont_map); - 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; - - label = create_artificial_label (tf_loc); - CASE_LABEL (last_case) = label; - - x = gimple_build_label (label); + cont_stmt = *cont_map->get (last_case); + + x = gimple_build_label (CASE_LABEL (last_case)); gimple_seq_add_stmt (&switch_body, x); gimple_seq_add_stmt (&switch_body, cont_stmt); maybe_record_in_goto_queue (state, cont_stmt); } if (cont_map) - pointer_map_destroy (cont_map); + delete cont_map; replace_goto_queue (tf); /* Make sure that the last case is the default label, as one is required. Then sort the labels, which is also required in GIMPLE. */ CASE_LOW (last_case) = NULL; + tree tem = case_label_vec.pop (); + gcc_assert (tem == last_case); sort_case_labels (case_label_vec); /* 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); + switch_stmt = gimple_build_switch (finally_tmp, last_case, + case_label_vec); gimple_set_location (switch_stmt, finally_loc); /* Need to link SWITCH_STMT after running replace_goto_queue @@ -1479,27 +1567,48 @@ /* 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 -decide_copy_try_finally (int ndests, gimple_seq finally) +decide_copy_try_finally (int ndests, bool may_throw, gimple_seq finally) { int f_estimate, sw_estimate; + geh_else *eh_else; + + /* If there's an EH_ELSE involved, the exception path is separate + and really doesn't come into play for this computation. */ + eh_else = get_eh_else (finally); + if (eh_else) + { + ndests -= may_throw; + finally = gimple_eh_else_n_body (eh_else); + } if (!optimize) - return false; + { + gimple_stmt_iterator gsi; + + if (ndests == 1) + return true; + + for (gsi = gsi_start (finally); !gsi_end_p (gsi); gsi_next (&gsi)) + { + /* Duplicate __builtin_stack_restore in the hope of eliminating it + on the EH paths and, consequently, useless cleanups. */ + gimple *stmt = gsi_stmt (gsi); + if (!is_gimple_debug (stmt) + && !gimple_clobber_p (stmt) + && !gimple_call_builtin_p (stmt, BUILT_IN_STACK_RESTORE)) + return false; + } + return true; + } /* Finally estimate N times, plus N gotos. */ - f_estimate = count_insns_seq (finally, &eni_size_weights); + f_estimate = estimate_num_insns_seq (finally, &eni_size_weights); f_estimate = (f_estimate + 1) * ndests; /* Switch statement (cost 10), N variable assignments, N gotos. */ @@ -1537,7 +1646,7 @@ arrange for the FINALLY block to be executed on all exits. */ static gimple_seq -lower_try_finally (struct leh_state *state, gimple tp) +lower_try_finally (struct leh_state *state, gtry *tp) { struct leh_tf_state this_tf; struct leh_state this_state; @@ -1550,7 +1659,7 @@ this_tf.try_finally_expr = tp; this_tf.top_p = tp; this_tf.outer = state; - if (using_eh_for_cleanups_p && !cleanup_is_dead_in (state->cur_region)) + if (using_eh_for_cleanups_p () && !cleanup_is_dead_in (state->cur_region)) { this_tf.region = gen_eh_region_cleanup (state->cur_region); this_state.cur_region = this_tf.region; @@ -1567,7 +1676,7 @@ old_eh_seq = eh_seq; eh_seq = NULL; - lower_eh_constructs_1 (&this_state, gimple_try_eval(tp)); + lower_eh_constructs_1 (&this_state, gimple_try_eval_ptr (tp)); /* Determine if the try block is escaped through the bottom. */ this_tf.may_fallthru = gimple_seq_may_fallthru (gimple_try_eval (tp)); @@ -1582,7 +1691,7 @@ how many destinations are reached by the finally block. Use this to determine how we process the finally block itself. */ - ndests = VEC_length (tree, this_tf.dest_array); + ndests = this_tf.dest_array.length (); ndests += this_tf.may_fallthru; ndests += this_tf.may_return; ndests += this_tf.may_throw; @@ -1602,7 +1711,8 @@ /* We can easily special-case redirection to a single destination. */ else if (ndests == 1) lower_try_finally_onedest (state, &this_tf); - else if (decide_copy_try_finally (ndests, gimple_try_cleanup (tp))) + else if (decide_copy_try_finally (ndests, this_tf.may_throw, + gimple_try_cleanup (tp))) lower_try_finally_copy (state, &this_tf); else lower_try_finally_switch (state, &this_tf); @@ -1612,15 +1722,14 @@ if (this_tf.fallthru_label) { /* This must be reached only if ndests == 0. */ - gimple x = gimple_build_label (this_tf.fallthru_label); + gimple *x = gimple_build_label (this_tf.fallthru_label); gimple_seq_add_stmt (&this_tf.top_p_seq, x); } - VEC_free (tree, heap, this_tf.dest_array); - if (this_tf.goto_queue) - free (this_tf.goto_queue); + this_tf.dest_array.release (); + free (this_tf.goto_queue); if (this_tf.goto_queue_map) - pointer_map_destroy (this_tf.goto_queue_map); + delete this_tf.goto_queue_map; /* If there was an old (aka outer) eh_seq, append the current eh_seq. If there was no old eh_seq, then the append is trivially already done. */ @@ -1632,7 +1741,7 @@ { gimple_seq new_eh_seq = eh_seq; eh_seq = old_eh_seq; - gimple_seq_add_seq(&eh_seq, new_eh_seq); + gimple_seq_add_seq (&eh_seq, new_eh_seq); } } @@ -1644,14 +1753,14 @@ exception region trees that records all the magic. */ static gimple_seq -lower_catch (struct leh_state *state, gimple tp) +lower_catch (struct leh_state *state, gtry *tp) { eh_region try_region = NULL; struct leh_state this_state = *state; gimple_stmt_iterator gsi; tree out_label; - gimple_seq new_seq; - gimple x; + gimple_seq new_seq, cleanup; + gimple *x; location_t try_catch_loc = gimple_location (tp); if (flag_exceptions) @@ -1660,7 +1769,7 @@ this_state.cur_region = try_region; } - lower_eh_constructs_1 (&this_state, gimple_try_eval (tp)); + lower_eh_constructs_1 (&this_state, gimple_try_eval_ptr (tp)); if (!eh_region_may_contain_throw (try_region)) return gimple_try_eval (tp); @@ -1672,20 +1781,27 @@ this_state.cur_region = state->cur_region; this_state.ehp_region = try_region; + /* Add eh_seq from lowering EH in the cleanup sequence after the cleanup + itself, so that e.g. for coverage purposes the nested cleanups don't + appear before the cleanup body. See PR64634 for details. */ + gimple_seq old_eh_seq = eh_seq; + eh_seq = NULL; + out_label = NULL; - for (gsi = gsi_start (gimple_try_cleanup (tp)); + cleanup = gimple_try_cleanup (tp); + for (gsi = gsi_start (cleanup); !gsi_end_p (gsi); gsi_next (&gsi)) { eh_catch c; - gimple gcatch; + gcatch *catch_stmt; gimple_seq handler; - gcatch = gsi_stmt (gsi); - c = gen_eh_region_catch (try_region, gimple_catch_types (gcatch)); - - handler = gimple_catch_handler (gcatch); - lower_eh_constructs_1 (&this_state, handler); + catch_stmt = as_a <gcatch *> (gsi_stmt (gsi)); + c = gen_eh_region_catch (try_region, gimple_catch_types (catch_stmt)); + + handler = gimple_catch_handler (catch_stmt); + lower_eh_constructs_1 (&this_state, &handler); c->label = create_artificial_label (UNKNOWN_LOCATION); x = gimple_build_label (c->label); @@ -1707,7 +1823,11 @@ gimple_try_set_cleanup (tp, new_seq); - return frob_into_branch_around (tp, try_region, out_label); + gimple_seq new_eh_seq = eh_seq; + eh_seq = old_eh_seq; + gimple_seq ret_seq = frob_into_branch_around (tp, try_region, out_label); + gimple_seq_add_seq (&eh_seq, new_eh_seq); + return ret_seq; } /* A subroutine of lower_eh_constructs_1. Lower a GIMPLE_TRY with a @@ -1715,11 +1835,11 @@ region trees that record all the magic. */ static gimple_seq -lower_eh_filter (struct leh_state *state, gimple tp) +lower_eh_filter (struct leh_state *state, gtry *tp) { struct leh_state this_state = *state; eh_region this_region = NULL; - gimple inner, x; + gimple *inner, *x; gimple_seq new_seq; inner = gimple_seq_first_stmt (gimple_try_cleanup (tp)); @@ -1731,7 +1851,7 @@ this_state.cur_region = this_region; } - lower_eh_constructs_1 (&this_state, gimple_try_eval (tp)); + lower_eh_constructs_1 (&this_state, gimple_try_eval_ptr (tp)); if (!eh_region_may_contain_throw (this_region)) return gimple_try_eval (tp); @@ -1747,7 +1867,7 @@ x = gimple_build_label (this_region->u.allowed.label); gimple_seq_add_stmt (&new_seq, x); - lower_eh_constructs_1 (&this_state, gimple_eh_filter_failure (inner)); + lower_eh_constructs_1 (&this_state, gimple_eh_filter_failure_ptr (inner)); gimple_seq_add_seq (&new_seq, gimple_eh_filter_failure (inner)); gimple_try_set_cleanup (tp, new_seq); @@ -1760,19 +1880,21 @@ plus the exception region trees that record all the magic. */ static gimple_seq -lower_eh_must_not_throw (struct leh_state *state, gimple tp) +lower_eh_must_not_throw (struct leh_state *state, gtry *tp) { struct leh_state this_state = *state; if (flag_exceptions) { - gimple inner = gimple_seq_first_stmt (gimple_try_cleanup (tp)); + gimple *inner = gimple_seq_first_stmt (gimple_try_cleanup (tp)); eh_region this_region; this_region = gen_eh_region_must_not_throw (state->cur_region); this_region->u.must_not_throw.failure_decl - = gimple_eh_must_not_throw_fndecl (inner); - this_region->u.must_not_throw.failure_loc = gimple_location (tp); + = gimple_eh_must_not_throw_fndecl ( + as_a <geh_mnt *> (inner)); + this_region->u.must_not_throw.failure_loc + = LOCATION_LOCUS (gimple_location (tp)); /* In order to get mangling applied to this decl, we must mark it used now. Otherwise, pass_ipa_free_lang_data won't think it @@ -1782,7 +1904,7 @@ this_state.cur_region = this_region; } - lower_eh_constructs_1 (&this_state, gimple_try_eval (tp)); + lower_eh_constructs_1 (&this_state, gimple_try_eval_ptr (tp)); return gimple_try_eval (tp); } @@ -1791,7 +1913,7 @@ except that we only execute the cleanup block for exception edges. */ static gimple_seq -lower_cleanup (struct leh_state *state, gimple tp) +lower_cleanup (struct leh_state *state, gtry *tp) { struct leh_state this_state = *state; eh_region this_region = NULL; @@ -1805,7 +1927,7 @@ this_state.cur_region = this_region; } - lower_eh_constructs_1 (&this_state, gimple_try_eval (tp)); + lower_eh_constructs_1 (&this_state, gimple_try_eval_ptr (tp)); if (cleanup_dead || !eh_region_may_contain_throw (this_region)) return gimple_try_eval (tp); @@ -1825,7 +1947,7 @@ { /* In this case honor_protect_cleanup_actions had nothing to do, and we should process this normally. */ - lower_eh_constructs_1 (state, gimple_try_cleanup (tp)); + lower_eh_constructs_1 (state, gimple_try_cleanup_ptr (tp)); result = frob_into_branch_around (tp, this_region, fake_tf.fallthru_label); } @@ -1837,7 +1959,7 @@ result = gimple_try_eval (tp); if (fake_tf.fallthru_label) { - gimple x = gimple_build_label (fake_tf.fallthru_label); + gimple *x = gimple_build_label (fake_tf.fallthru_label); gimple_seq_add_stmt (&result, x); } } @@ -1851,8 +1973,8 @@ lower_eh_constructs_2 (struct leh_state *state, gimple_stmt_iterator *gsi) { gimple_seq replace; - gimple x; - gimple stmt = gsi_stmt (*gsi); + gimple *x; + gimple *stmt = gsi_stmt (*gsi); switch (gimple_code (stmt)) { @@ -1870,7 +1992,8 @@ this zero argument with the current catch region number. */ if (state->ehp_region) { - tree nr = build_int_cst (NULL, state->ehp_region->index); + tree nr = build_int_cst (integer_type_node, + state->ehp_region->index); gimple_call_set_arg (stmt, 0, nr); } else @@ -1907,7 +2030,7 @@ /* 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. Only do so for statements that - potentially fall thru (no noreturn calls e.g.), otherwise + potentially fall through (no noreturn calls e.g.), otherwise this new assignment might create fake fallthru regions. */ if (stmt_could_throw_p (stmt) && gimple_has_lhs (stmt) @@ -1916,8 +2039,8 @@ && 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); + tree tmp = create_tmp_var (TREE_TYPE (lhs)); + 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); @@ -1941,37 +2064,43 @@ break; case GIMPLE_SWITCH: - verify_norecord_switch_expr (state, stmt); + verify_norecord_switch_expr (state, as_a <gswitch *> (stmt)); break; case GIMPLE_TRY: - if (gimple_try_kind (stmt) == GIMPLE_TRY_FINALLY) - replace = lower_try_finally (state, stmt); - else - { - x = gimple_seq_first_stmt (gimple_try_cleanup (stmt)); - if (!x) - { - replace = gimple_try_eval (stmt); - lower_eh_constructs_1 (state, replace); - } - else - switch (gimple_code (x)) + { + gtry *try_stmt = as_a <gtry *> (stmt); + if (gimple_try_kind (try_stmt) == GIMPLE_TRY_FINALLY) + replace = lower_try_finally (state, try_stmt); + else + { + x = gimple_seq_first_stmt (gimple_try_cleanup (try_stmt)); + if (!x) { + replace = gimple_try_eval (try_stmt); + lower_eh_constructs_1 (state, &replace); + } + else + switch (gimple_code (x)) + { case GIMPLE_CATCH: - replace = lower_catch (state, stmt); - break; + replace = lower_catch (state, try_stmt); + break; case GIMPLE_EH_FILTER: - replace = lower_eh_filter (state, stmt); - break; + replace = lower_eh_filter (state, try_stmt); + break; case GIMPLE_EH_MUST_NOT_THROW: - replace = lower_eh_must_not_throw (state, stmt); - break; + replace = lower_eh_must_not_throw (state, try_stmt); + break; + case GIMPLE_EH_ELSE: + /* This code is only valid with GIMPLE_TRY_FINALLY. */ + gcc_unreachable (); default: - replace = lower_cleanup (state, stmt); - break; - } - } + replace = lower_cleanup (state, try_stmt); + break; + } + } + } /* Remove the old stmt and insert the transformed sequence instead. */ @@ -1981,6 +2110,10 @@ /* Return since we don't want gsi_next () */ return; + case GIMPLE_EH_ELSE: + /* We should be eliminating this in lower_try_finally et al. */ + gcc_unreachable (); + default: /* A type, a decl, or some kind of statement that we're not interested in. Don't walk them. */ @@ -1993,15 +2126,42 @@ /* 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) +lower_eh_constructs_1 (struct leh_state *state, gimple_seq *pseq) { gimple_stmt_iterator gsi; - for (gsi = gsi_start (seq); !gsi_end_p (gsi);) + for (gsi = gsi_start (*pseq); !gsi_end_p (gsi);) lower_eh_constructs_2 (state, &gsi); } -static unsigned int -lower_eh_constructs (void) +namespace { + +const pass_data pass_data_lower_eh = +{ + GIMPLE_PASS, /* type */ + "eh", /* name */ + OPTGROUP_NONE, /* optinfo_flags */ + TV_TREE_EH, /* tv_id */ + PROP_gimple_lcf, /* properties_required */ + PROP_gimple_leh, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0, /* todo_flags_finish */ +}; + +class pass_lower_eh : public gimple_opt_pass +{ +public: + pass_lower_eh (gcc::context *ctxt) + : gimple_opt_pass (pass_data_lower_eh, ctxt) + {} + + /* opt_pass methods: */ + virtual unsigned int execute (function *); + +}; // class pass_lower_eh + +unsigned int +pass_lower_eh::execute (function *fun) { struct leh_state null_state; gimple_seq bodyp; @@ -2010,12 +2170,13 @@ if (bodyp == NULL) return 0; - finally_tree = htab_create (31, struct_ptr_hash, struct_ptr_eq, free); + finally_tree = new hash_table<finally_tree_hasher> (31); eh_region_may_contain_throw_map = BITMAP_ALLOC (NULL); memset (&null_state, 0, sizeof (null_state)); collect_finally_tree_1 (bodyp, NULL); - lower_eh_constructs_1 (&null_state, bodyp); + lower_eh_constructs_1 (&null_state, &bodyp); + gimple_set_body (current_function_decl, bodyp); /* We assume there's a return statement, or something, at the end of the function, and thus ploping the EH sequence afterward won't @@ -2027,13 +2188,14 @@ didn't change its value, and we don't have to re-set the function. */ gcc_assert (bodyp == gimple_body (current_function_decl)); - htab_delete (finally_tree); + delete finally_tree; + finally_tree = NULL; BITMAP_FREE (eh_region_may_contain_throw_map); eh_seq = NULL; /* If this function needs a language specific EH personality routine and the frontend didn't already set one do so now. */ - if (function_needs_eh_personality (cfun) == eh_personality_lang + if (function_needs_eh_personality (fun) == eh_personality_lang && !DECL_FUNCTION_PERSONALITY (current_function_decl)) DECL_FUNCTION_PERSONALITY (current_function_decl) = lang_hooks.eh_personality (); @@ -2041,31 +2203,20 @@ return 0; } -struct gimple_opt_pass pass_lower_eh = +} // anon namespace + +gimple_opt_pass * +make_pass_lower_eh (gcc::context *ctxt) { - { - GIMPLE_PASS, - "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 */ - 0, /* properties_destroyed */ - 0, /* todo_flags_start */ - TODO_dump_func /* todo_flags_finish */ - } -}; + return new pass_lower_eh (ctxt); +} /* Create the multiple edges from an EH_DISPATCH statement to all of the possible handlers for its EH region. Return true if there's no fallthru edge; false if there is. */ bool -make_eh_dispatch_edges (gimple stmt) +make_eh_dispatch_edges (geh_dispatch *stmt) { eh_region r; eh_catch c; @@ -2104,7 +2255,7 @@ if there is such a landing pad within the current function. */ void -make_eh_edges (gimple stmt) +make_eh_edges (gimple *stmt) { basic_block src, dst; eh_landing_pad lp; @@ -2136,7 +2287,7 @@ { eh_landing_pad old_lp, new_lp; basic_block old_bb; - gimple throw_stmt; + gimple *throw_stmt; int old_lp_nr, new_lp_nr; tree old_label, new_label; edge_iterator ei; @@ -2223,7 +2374,7 @@ The actual edge update will happen in the caller. */ void -redirect_eh_dispatch_edge (gimple stmt, edge e, basic_block new_bb) +redirect_eh_dispatch_edge (geh_dispatch *stmt, edge e, basic_block new_bb) { tree new_lab = gimple_block_label (new_bb); bool any_changed = false; @@ -2311,11 +2462,6 @@ 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: @@ -2365,7 +2511,8 @@ if (TREE_CODE_CLASS (op) != tcc_comparison && TREE_CODE_CLASS (op) != tcc_unary - && TREE_CODE_CLASS (op) != tcc_binary) + && TREE_CODE_CLASS (op) != tcc_binary + && op != FMA_EXPR) return false; return operation_could_trap_helper_p (op, fp_operation, honor_trapv, @@ -2373,6 +2520,68 @@ &handled); } + +/* Returns true if it is possible to prove that the index of + an array access REF (an ARRAY_REF expression) falls into the + array bounds. */ + +static bool +in_array_bounds_p (tree ref) +{ + tree idx = TREE_OPERAND (ref, 1); + tree min, max; + + if (TREE_CODE (idx) != INTEGER_CST) + return false; + + min = array_ref_low_bound (ref); + max = array_ref_up_bound (ref); + if (!min + || !max + || TREE_CODE (min) != INTEGER_CST + || TREE_CODE (max) != INTEGER_CST) + return false; + + if (tree_int_cst_lt (idx, min) + || tree_int_cst_lt (max, idx)) + return false; + + return true; +} + +/* Returns true if it is possible to prove that the range of + an array access REF (an ARRAY_RANGE_REF expression) falls + into the array bounds. */ + +static bool +range_in_array_bounds_p (tree ref) +{ + tree domain_type = TYPE_DOMAIN (TREE_TYPE (ref)); + tree range_min, range_max, min, max; + + range_min = TYPE_MIN_VALUE (domain_type); + range_max = TYPE_MAX_VALUE (domain_type); + if (!range_min + || !range_max + || TREE_CODE (range_min) != INTEGER_CST + || TREE_CODE (range_max) != INTEGER_CST) + return false; + + min = array_ref_low_bound (ref); + max = array_ref_up_bound (ref); + if (!min + || !max + || TREE_CODE (min) != INTEGER_CST + || TREE_CODE (max) != INTEGER_CST) + return false; + + if (tree_int_cst_lt (range_min, min) + || tree_int_cst_lt (max, range_max)) + return false; + + return true; +} + /* Return true if EXPR can trap, as in dereferencing an invalid pointer location or floating point arithmetic. C.f. the rtl version, may_trap_p. This routine expects only GIMPLE lhs or rhs input. */ @@ -2408,12 +2617,6 @@ restart: switch (code) { - case TARGET_MEM_REF: - if (TREE_CODE (TMR_BASE (expr)) == ADDR_EXPR - && !TMR_INDEX (expr) && !TMR_INDEX2 (expr)) - return false; - return !TREE_THIS_NOTRAP (expr); - case COMPONENT_REF: case REALPART_EXPR: case IMAGPART_EXPR: @@ -2440,10 +2643,36 @@ return false; return !in_array_bounds_p (expr); + case TARGET_MEM_REF: case MEM_REF: + if (TREE_CODE (TREE_OPERAND (expr, 0)) == ADDR_EXPR + && tree_could_trap_p (TREE_OPERAND (TREE_OPERAND (expr, 0), 0))) + return true; + if (TREE_THIS_NOTRAP (expr)) + return false; + /* We cannot prove that the access is in-bounds when we have + variable-index TARGET_MEM_REFs. */ + if (code == TARGET_MEM_REF + && (TMR_INDEX (expr) || TMR_INDEX2 (expr))) + return true; if (TREE_CODE (TREE_OPERAND (expr, 0)) == ADDR_EXPR) - return false; - /* Fallthru. */ + { + tree base = TREE_OPERAND (TREE_OPERAND (expr, 0), 0); + offset_int off = mem_ref_offset (expr); + if (wi::neg_p (off, SIGNED)) + return true; + if (TREE_CODE (base) == STRING_CST) + return wi::leu_p (TREE_STRING_LENGTH (base), off); + else if (DECL_SIZE_UNIT (base) == NULL_TREE + || TREE_CODE (DECL_SIZE_UNIT (base)) != INTEGER_CST + || wi::leu_p (wi::to_offset (DECL_SIZE_UNIT (base)), off)) + return true; + /* Now we are sure the first byte of the access is inside + the object. */ + return false; + } + return true; + case INDIRECT_REF: return !TREE_THIS_NOTRAP (expr); @@ -2453,8 +2682,36 @@ case CALL_EXPR: t = get_callee_fndecl (expr); /* Assume that calls to weak functions may trap. */ - if (!t || !DECL_P (t) || DECL_WEAK (t)) + if (!t || !DECL_P (t)) return true; + if (DECL_WEAK (t)) + return tree_could_trap_p (t); + return false; + + case FUNCTION_DECL: + /* Assume that accesses to weak functions may trap, unless we know + they are certainly defined in current TU or in some other + LTO partition. */ + if (DECL_WEAK (expr) && !DECL_COMDAT (expr) && DECL_EXTERNAL (expr)) + { + cgraph_node *node = cgraph_node::get (expr); + if (node) + node = node->function_symbol (); + return !(node && node->in_other_partition); + } + return false; + + case VAR_DECL: + /* Assume that accesses to weak vars may trap, unless we know + they are certainly defined in current TU or in some other + LTO partition. */ + if (DECL_WEAK (expr) && !DECL_COMDAT (expr) && DECL_EXTERNAL (expr)) + { + varpool_node *node = varpool_node::get (expr); + if (node) + node = node->ultimate_alias_target (); + return !(node && node->in_other_partition); + } return false; default: @@ -2467,9 +2724,9 @@ an assignment or a conditional) may throw. */ static bool -stmt_could_throw_1_p (gimple stmt) +stmt_could_throw_1_p (gassign *stmt) { - enum tree_code code = gimple_expr_code (stmt); + enum tree_code code = gimple_assign_rhs_code (stmt); bool honor_nans = false; bool honor_snans = false; bool fp_operation = false; @@ -2480,9 +2737,13 @@ if (TREE_CODE_CLASS (code) == tcc_comparison || TREE_CODE_CLASS (code) == tcc_unary - || TREE_CODE_CLASS (code) == tcc_binary) + || TREE_CODE_CLASS (code) == tcc_binary + || code == FMA_EXPR) { - t = gimple_expr_type (stmt); + if (TREE_CODE_CLASS (code) == tcc_comparison) + t = TREE_TYPE (gimple_assign_rhs1 (stmt)); + else + t = gimple_expr_type (stmt); fp_operation = FLOAT_TYPE_P (t); if (fp_operation) { @@ -2493,17 +2754,21 @@ honor_trapv = true; } + /* First check the LHS. */ + if (tree_could_trap_p (gimple_assign_lhs (stmt))) + return 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, + honor_nans, honor_snans, + gimple_assign_rhs2 (stmt), &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++) + for (i = 1; i < gimple_num_ops (stmt); i++) if (tree_could_trap_p (gimple_op (stmt, i))) return true; @@ -2514,7 +2779,7 @@ /* Return true if statement STMT could throw an exception. */ bool -stmt_could_throw_p (gimple stmt) +stmt_could_throw_p (gimple *stmt) { if (!flag_exceptions) return false; @@ -2527,18 +2792,29 @@ return true; case GIMPLE_CALL: - return !gimple_call_nothrow_p (stmt); + return !gimple_call_nothrow_p (as_a <gcall *> (stmt)); + + case GIMPLE_COND: + { + if (!cfun->can_throw_non_call_exceptions) + return false; + gcond *cond = as_a <gcond *> (stmt); + tree lhs = gimple_cond_lhs (cond); + return operation_could_trap_p (gimple_cond_code (cond), + FLOAT_TYPE_P (TREE_TYPE (lhs)), + false, NULL_TREE); + } case GIMPLE_ASSIGN: - case GIMPLE_COND: - if (!cfun->can_throw_non_call_exceptions) + if (!cfun->can_throw_non_call_exceptions + || gimple_clobber_p (stmt)) return false; - return stmt_could_throw_1_p (stmt); + return stmt_could_throw_1_p (as_a <gassign *> (stmt)); case GIMPLE_ASM: if (!cfun->can_throw_non_call_exceptions) return false; - return gimple_asm_volatile_p (stmt); + return gimple_asm_volatile_p (as_a <gasm *> (stmt)); default: return false; @@ -2574,7 +2850,7 @@ the current function (CFUN). */ bool -stmt_can_throw_external (gimple stmt) +stmt_can_throw_external (gimple *stmt) { int lp_nr; @@ -2589,7 +2865,7 @@ the current function (CFUN). */ bool -stmt_can_throw_internal (gimple stmt) +stmt_can_throw_internal (gimple *stmt) { int lp_nr; @@ -2605,7 +2881,7 @@ any change was made. */ bool -maybe_clean_eh_stmt_fn (struct function *ifun, gimple stmt) +maybe_clean_eh_stmt_fn (struct function *ifun, gimple *stmt) { if (stmt_could_throw_p (stmt)) return false; @@ -2615,7 +2891,7 @@ /* Likewise, but always use the current function. */ bool -maybe_clean_eh_stmt (gimple stmt) +maybe_clean_eh_stmt (gimple *stmt) { return maybe_clean_eh_stmt_fn (cfun, stmt); } @@ -2626,7 +2902,7 @@ done that my require an EH edge purge. */ bool -maybe_clean_or_replace_eh_stmt (gimple old_stmt, gimple new_stmt) +maybe_clean_or_replace_eh_stmt (gimple *old_stmt, gimple *new_stmt) { int lp_nr = lookup_stmt_eh_lp (old_stmt); @@ -2650,17 +2926,17 @@ return false; } -/* Given a statement OLD_STMT in OLD_FUN and a duplicate statment NEW_STMT +/* Given a statement OLD_STMT in OLD_FUN and a duplicate statement NEW_STMT in NEW_FUN, copy the EH table data from OLD_STMT to NEW_STMT. The MAP operand is the return value of duplicate_eh_regions. */ bool -maybe_duplicate_eh_stmt_fn (struct function *new_fun, gimple new_stmt, - struct function *old_fun, gimple old_stmt, - struct pointer_map_t *map, int default_lp_nr) +maybe_duplicate_eh_stmt_fn (struct function *new_fun, gimple *new_stmt, + struct function *old_fun, gimple *old_stmt, + hash_map<void *, void *> *map, + int default_lp_nr) { int old_lp_nr, new_lp_nr; - void **slot; if (!stmt_could_throw_p (new_stmt)) return false; @@ -2676,18 +2952,16 @@ { eh_landing_pad old_lp, new_lp; - old_lp = VEC_index (eh_landing_pad, old_fun->eh->lp_array, old_lp_nr); - slot = pointer_map_contains (map, old_lp); - new_lp = (eh_landing_pad) *slot; + old_lp = (*old_fun->eh->lp_array)[old_lp_nr]; + new_lp = static_cast<eh_landing_pad> (*map->get (old_lp)); new_lp_nr = new_lp->index; } else { eh_region old_r, new_r; - old_r = VEC_index (eh_region, old_fun->eh->region_array, -old_lp_nr); - slot = pointer_map_contains (map, old_r); - new_r = (eh_region) *slot; + old_r = (*old_fun->eh->region_array)[-old_lp_nr]; + new_r = static_cast<eh_region> (*map->get (old_r)); new_lp_nr = -new_r->index; } @@ -2699,7 +2973,7 @@ and thus no remapping is required. */ bool -maybe_duplicate_eh_stmt (gimple new_stmt, gimple old_stmt) +maybe_duplicate_eh_stmt (gimple *new_stmt, gimple *old_stmt) { int lp_nr; @@ -2724,7 +2998,7 @@ same_handler_p (gimple_seq oneh, gimple_seq twoh) { gimple_stmt_iterator gsi; - gimple ones, twos; + gimple *ones, *twos; unsigned int ai; gsi = gsi_start (oneh); @@ -2743,7 +3017,7 @@ || 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_same_target_p (ones, twos) || gimple_call_num_args (ones) != gimple_call_num_args (twos)) return false; @@ -2766,12 +3040,14 @@ temporary used in the initializer for A. */ static void -optimize_double_finally (gimple one, gimple two) +optimize_double_finally (gtry *one, gtry *two) { - gimple oneh; + gimple *oneh; gimple_stmt_iterator gsi; - - gsi = gsi_start (gimple_try_cleanup (one)); + gimple_seq cleanup; + + cleanup = gimple_try_cleanup (one); + gsi = gsi_start (cleanup); if (!gsi_one_before_end_p (gsi)) return; @@ -2799,7 +3075,7 @@ refactor_eh_r (gimple_seq seq) { gimple_stmt_iterator gsi; - gimple one, two; + gimple *one, *two; one = NULL; two = NULL; @@ -2811,13 +3087,12 @@ 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 && two) + if (gtry *try_one = dyn_cast <gtry *> (one)) + if (gtry *try_two = dyn_cast <gtry *> (two)) + if (gimple_try_kind (try_one) == GIMPLE_TRY_FINALLY + && gimple_try_kind (try_two) == GIMPLE_TRY_FINALLY) + optimize_double_finally (try_one, try_two); if (one) switch (gimple_code (one)) { @@ -2826,11 +3101,18 @@ refactor_eh_r (gimple_try_cleanup (one)); break; case GIMPLE_CATCH: - refactor_eh_r (gimple_catch_handler (one)); + refactor_eh_r (gimple_catch_handler (as_a <gcatch *> (one))); break; case GIMPLE_EH_FILTER: refactor_eh_r (gimple_eh_filter_failure (one)); break; + case GIMPLE_EH_ELSE: + { + geh_else *eh_else_stmt = as_a <geh_else *> (one); + refactor_eh_r (gimple_eh_else_n_body (eh_else_stmt)); + refactor_eh_r (gimple_eh_else_e_body (eh_else_stmt)); + } + break; default: break; } @@ -2841,47 +3123,56 @@ } } -static unsigned -refactor_eh (void) +namespace { + +const pass_data pass_data_refactor_eh = { - refactor_eh_r (gimple_body (current_function_decl)); - return 0; -} - -static bool -gate_refactor_eh (void) -{ - return flag_exceptions != 0; -} - -struct gimple_opt_pass pass_refactor_eh = + GIMPLE_PASS, /* type */ + "ehopt", /* name */ + OPTGROUP_NONE, /* optinfo_flags */ + TV_TREE_EH, /* tv_id */ + PROP_gimple_lcf, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0, /* todo_flags_finish */ +}; + +class pass_refactor_eh : public gimple_opt_pass { - { - GIMPLE_PASS, - "ehopt", /* name */ - gate_refactor_eh, /* 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 */ - TODO_dump_func /* todo_flags_finish */ - } -}; +public: + pass_refactor_eh (gcc::context *ctxt) + : gimple_opt_pass (pass_data_refactor_eh, ctxt) + {} + + /* opt_pass methods: */ + virtual bool gate (function *) { return flag_exceptions != 0; } + virtual unsigned int execute (function *) + { + refactor_eh_r (gimple_body (current_function_decl)); + return 0; + } + +}; // class pass_refactor_eh + +} // anon namespace + +gimple_opt_pass * +make_pass_refactor_eh (gcc::context *ctxt) +{ + return new pass_refactor_eh (ctxt); +} /* At the end of gimple optimization, we can lower RESX. */ static bool -lower_resx (basic_block bb, gimple stmt, struct pointer_map_t *mnt_map) +lower_resx (basic_block bb, gresx *stmt, + hash_map<eh_region, tree> *mnt_map) { int lp_nr; eh_region src_r, dst_r; gimple_stmt_iterator gsi; - gimple x; + gimple *x; tree fn, src_nr; bool ret = false; @@ -2904,7 +3195,7 @@ Resolve this by expanding the resx node to an abort. */ - fn = implicit_built_in_decls[BUILT_IN_TRAP]; + fn = builtin_decl_implicit (BUILT_IN_TRAP); x = gimple_build_call (fn, 0); gsi_insert_before (&gsi, x, GSI_SAME_STMT); @@ -2921,19 +3212,19 @@ if (lp_nr < 0) { basic_block new_bb; - void **slot; tree lab; /* We are resuming into a MUST_NOT_CALL region. Expand a call to the failure decl into a new block, if needed. */ gcc_assert (dst_r->type == ERT_MUST_NOT_THROW); - slot = pointer_map_contains (mnt_map, dst_r); + tree *slot = mnt_map->get (dst_r); if (slot == NULL) { gimple_stmt_iterator gsi2; new_bb = create_empty_bb (bb); + add_bb_to_loop (new_bb, bb->loop_father); lab = gimple_block_label (new_bb); gsi2 = gsi_start_bb (new_bb); @@ -2942,27 +3233,24 @@ gimple_set_location (x, dst_r->u.must_not_throw.failure_loc); gsi_insert_after (&gsi2, x, GSI_CONTINUE_LINKING); - slot = pointer_map_insert (mnt_map, dst_r); - *slot = lab; + mnt_map->put (dst_r, lab); } else { - lab = (tree) *slot; + lab = *slot; new_bb = label_to_block (lab); } gcc_assert (EDGE_COUNT (bb->succs) == 0); - e = make_edge (bb, new_bb, EDGE_FALLTHRU); - e->count = bb->count; - e->probability = REG_BR_PROB_BASE; + e = make_single_succ_edge (bb, new_bb, EDGE_FALLTHRU); } else { edge_iterator ei; - tree dst_nr = build_int_cst (NULL, dst_r->index); - - fn = implicit_built_in_decls[BUILT_IN_EH_COPY_VALUES]; - src_nr = build_int_cst (NULL, src_r->index); + tree dst_nr = build_int_cst (integer_type_node, dst_r->index); + + fn = builtin_decl_implicit (BUILT_IN_EH_COPY_VALUES); + src_nr = build_int_cst (integer_type_node, src_r->index); x = gimple_build_call (fn, 2, dst_nr, src_nr); gsi_insert_before (&gsi, x, GSI_SAME_STMT); @@ -2970,6 +3258,7 @@ e = single_succ_edge (bb); gcc_assert (e->flags & EDGE_EH); e->flags = (e->flags & ~EDGE_EH) | EDGE_FALLTHRU; + e->probability = profile_probability::always (); /* If there are no more EH users of the landing pad, delete it. */ FOR_EACH_EDGE (e, ei, e->dest->preds) @@ -2993,24 +3282,36 @@ _Unwind_Resume library function. */ /* The ARM EABI redefines _Unwind_Resume as __cxa_end_cleanup - with no arguments for C++ and Java. Check for that. */ + with no arguments for C++. Check for that. */ if (src_r->use_cxa_end_cleanup) { - fn = implicit_built_in_decls[BUILT_IN_CXA_END_CLEANUP]; + fn = builtin_decl_implicit (BUILT_IN_CXA_END_CLEANUP); x = gimple_build_call (fn, 0); gsi_insert_before (&gsi, x, GSI_SAME_STMT); } else { - fn = implicit_built_in_decls[BUILT_IN_EH_POINTER]; - src_nr = build_int_cst (NULL, src_r->index); + fn = builtin_decl_implicit (BUILT_IN_EH_POINTER); + src_nr = build_int_cst (integer_type_node, src_r->index); x = gimple_build_call (fn, 1, src_nr); - var = create_tmp_var (ptr_type_node, NULL); + var = create_tmp_var (ptr_type_node); var = make_ssa_name (var, x); gimple_call_set_lhs (x, var); gsi_insert_before (&gsi, x, GSI_SAME_STMT); - fn = implicit_built_in_decls[BUILT_IN_UNWIND_RESUME]; + /* When exception handling is delegated to a caller function, we + have to guarantee that shadow memory variables living on stack + will be cleaner before control is given to a parent function. */ + if (sanitize_flags_p (SANITIZE_ADDRESS)) + { + tree decl + = builtin_decl_implicit (BUILT_IN_ASAN_HANDLE_NO_RETURN); + gimple *g = gimple_build_call (decl, 0); + gimple_set_location (g, gimple_location (stmt)); + gsi_insert_before (&gsi, g, GSI_SAME_STMT); + } + + fn = builtin_decl_implicit (BUILT_IN_UNWIND_RESUME); x = gimple_build_call (fn, 1, var); gsi_insert_before (&gsi, x, GSI_SAME_STMT); } @@ -3023,28 +3324,54 @@ return ret; } -static unsigned -execute_lower_resx (void) +namespace { + +const pass_data pass_data_lower_resx = +{ + GIMPLE_PASS, /* type */ + "resx", /* name */ + OPTGROUP_NONE, /* optinfo_flags */ + TV_TREE_EH, /* tv_id */ + PROP_gimple_lcf, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0, /* todo_flags_finish */ +}; + +class pass_lower_resx : public gimple_opt_pass +{ +public: + pass_lower_resx (gcc::context *ctxt) + : gimple_opt_pass (pass_data_lower_resx, ctxt) + {} + + /* opt_pass methods: */ + virtual bool gate (function *) { return flag_exceptions != 0; } + virtual unsigned int execute (function *); + +}; // class pass_lower_resx + +unsigned +pass_lower_resx::execute (function *fun) { basic_block bb; - struct pointer_map_t *mnt_map; bool dominance_invalidated = false; bool any_rewritten = false; - mnt_map = pointer_map_create (); - - FOR_EACH_BB (bb) + hash_map<eh_region, tree> mnt_map; + + FOR_EACH_BB_FN (bb, fun) { - gimple last = last_stmt (bb); + gimple *last = last_stmt (bb); if (last && is_gimple_resx (last)) { - dominance_invalidated |= lower_resx (bb, last, mnt_map); + dominance_invalidated |= + lower_resx (bb, as_a <gresx *> (last), &mnt_map); any_rewritten = true; } } - pointer_map_destroy (mnt_map); - if (dominance_invalidated) { free_dominance_info (CDI_DOMINATORS); @@ -3054,43 +3381,209 @@ return any_rewritten ? TODO_update_ssa_only_virtuals : 0; } -static bool -gate_lower_resx (void) +} // anon namespace + +gimple_opt_pass * +make_pass_lower_resx (gcc::context *ctxt) +{ + return new pass_lower_resx (ctxt); +} + +/* Try to optimize var = {v} {CLOBBER} stmts followed just by + external throw. */ + +static void +optimize_clobbers (basic_block bb) { - return flag_exceptions != 0; + gimple_stmt_iterator gsi = gsi_last_bb (bb); + bool any_clobbers = false; + bool seen_stack_restore = false; + edge_iterator ei; + edge e; + + /* Only optimize anything if the bb contains at least one clobber, + ends with resx (checked by caller), optionally contains some + debug stmts or labels, or at most one __builtin_stack_restore + call, and has an incoming EH edge. */ + for (gsi_prev (&gsi); !gsi_end_p (gsi); gsi_prev (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + if (is_gimple_debug (stmt)) + continue; + if (gimple_clobber_p (stmt)) + { + any_clobbers = true; + continue; + } + if (!seen_stack_restore + && gimple_call_builtin_p (stmt, BUILT_IN_STACK_RESTORE)) + { + seen_stack_restore = true; + continue; + } + if (gimple_code (stmt) == GIMPLE_LABEL) + break; + return; + } + if (!any_clobbers) + return; + FOR_EACH_EDGE (e, ei, bb->preds) + if (e->flags & EDGE_EH) + break; + if (e == NULL) + return; + gsi = gsi_last_bb (bb); + for (gsi_prev (&gsi); !gsi_end_p (gsi); gsi_prev (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + if (!gimple_clobber_p (stmt)) + continue; + unlink_stmt_vdef (stmt); + gsi_remove (&gsi, true); + release_defs (stmt); + } } -struct gimple_opt_pass pass_lower_resx = +/* Try to sink var = {v} {CLOBBER} stmts followed just by + internal throw to successor BB. */ + +static int +sink_clobbers (basic_block bb) { - { - GIMPLE_PASS, - "resx", /* name */ - gate_lower_resx, /* gate */ - execute_lower_resx, /* 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_verify_flow /* todo_flags_finish */ - } -}; - + edge e; + edge_iterator ei; + gimple_stmt_iterator gsi, dgsi; + basic_block succbb; + bool any_clobbers = false; + unsigned todo = 0; + + /* Only optimize if BB has a single EH successor and + all predecessor edges are EH too. */ + if (!single_succ_p (bb) + || (single_succ_edge (bb)->flags & EDGE_EH) == 0) + return 0; + + FOR_EACH_EDGE (e, ei, bb->preds) + { + if ((e->flags & EDGE_EH) == 0) + return 0; + } + + /* And BB contains only CLOBBER stmts before the final + RESX. */ + gsi = gsi_last_bb (bb); + for (gsi_prev (&gsi); !gsi_end_p (gsi); gsi_prev (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + if (is_gimple_debug (stmt)) + continue; + if (gimple_code (stmt) == GIMPLE_LABEL) + break; + if (!gimple_clobber_p (stmt)) + return 0; + any_clobbers = true; + } + if (!any_clobbers) + return 0; + + edge succe = single_succ_edge (bb); + succbb = succe->dest; + + /* See if there is a virtual PHI node to take an updated virtual + operand from. */ + gphi *vphi = NULL; + tree vuse = NULL_TREE; + for (gphi_iterator gpi = gsi_start_phis (succbb); + !gsi_end_p (gpi); gsi_next (&gpi)) + { + tree res = gimple_phi_result (gpi.phi ()); + if (virtual_operand_p (res)) + { + vphi = gpi.phi (); + vuse = res; + break; + } + } + + dgsi = gsi_after_labels (succbb); + gsi = gsi_last_bb (bb); + for (gsi_prev (&gsi); !gsi_end_p (gsi); gsi_prev (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + tree lhs; + if (is_gimple_debug (stmt)) + continue; + if (gimple_code (stmt) == GIMPLE_LABEL) + break; + lhs = gimple_assign_lhs (stmt); + /* Unfortunately we don't have dominance info updated at this + point, so checking if + dominated_by_p (CDI_DOMINATORS, succbb, + gimple_bb (SSA_NAME_DEF_STMT (TREE_OPERAND (lhs, 0))) + would be too costly. Thus, avoid sinking any clobbers that + refer to non-(D) SSA_NAMEs. */ + if (TREE_CODE (lhs) == MEM_REF + && TREE_CODE (TREE_OPERAND (lhs, 0)) == SSA_NAME + && !SSA_NAME_IS_DEFAULT_DEF (TREE_OPERAND (lhs, 0))) + { + unlink_stmt_vdef (stmt); + gsi_remove (&gsi, true); + release_defs (stmt); + continue; + } + + /* As we do not change stmt order when sinking across a + forwarder edge we can keep virtual operands in place. */ + gsi_remove (&gsi, false); + gsi_insert_before (&dgsi, stmt, GSI_NEW_STMT); + + /* But adjust virtual operands if we sunk across a PHI node. */ + if (vuse) + { + gimple *use_stmt; + imm_use_iterator iter; + use_operand_p use_p; + FOR_EACH_IMM_USE_STMT (use_stmt, iter, vuse) + FOR_EACH_IMM_USE_ON_STMT (use_p, iter) + SET_USE (use_p, gimple_vdef (stmt)); + if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (vuse)) + { + SSA_NAME_OCCURS_IN_ABNORMAL_PHI (gimple_vdef (stmt)) = 1; + SSA_NAME_OCCURS_IN_ABNORMAL_PHI (vuse) = 0; + } + /* Adjust the incoming virtual operand. */ + SET_USE (PHI_ARG_DEF_PTR_FROM_EDGE (vphi, succe), gimple_vuse (stmt)); + SET_USE (gimple_vuse_op (stmt), vuse); + } + /* If there isn't a single predecessor but no virtual PHI node + arrange for virtual operands to be renamed. */ + else if (gimple_vuse_op (stmt) != NULL_USE_OPERAND_P + && !single_pred_p (succbb)) + { + /* In this case there will be no use of the VDEF of this stmt. + ??? Unless this is a secondary opportunity and we have not + removed unreachable blocks yet, so we cannot assert this. + Which also means we will end up renaming too many times. */ + SET_USE (gimple_vuse_op (stmt), gimple_vop (cfun)); + mark_virtual_operands_for_renaming (cfun); + todo |= TODO_update_ssa_only_virtuals; + } + } + + return todo; +} /* At the end of inlining, we can lower EH_DISPATCH. Return true when we have found some duplicate labels and removed some edges. */ static bool -lower_eh_dispatch (basic_block src, gimple stmt) +lower_eh_dispatch (basic_block src, geh_dispatch *stmt) { gimple_stmt_iterator gsi; int region_nr; eh_region r; tree filter, fn; - gimple x; + gimple *x; bool redirected = false; region_nr = gimple_eh_dispatch_region (stmt); @@ -3102,16 +3595,16 @@ { case ERT_TRY: { - VEC (tree, heap) *labels = NULL; + auto_vec<tree> labels; tree default_label = NULL; eh_catch c; edge_iterator ei; edge e; - struct pointer_set_t *seen_values = pointer_set_create (); + hash_set<tree> seen_values; /* Collect the labels for a switch. Zero the post_landing_pad field becase we'll no longer have anything keeping these labels - in existance and the optimizer will be free to merge these + in existence and the optimizer will be free to merge these blocks at will. */ for (c = r->u.eh_try.first_catch; c ; c = c->next_catch) { @@ -3134,12 +3627,12 @@ attached to the handler anymore, we remove the corresponding edge and then we delete unreachable blocks at the end of this pass. */ - if (! pointer_set_contains (seen_values, TREE_VALUE (flt_node))) + if (! seen_values.contains (TREE_VALUE (flt_node))) { - tree t = build3 (CASE_LABEL_EXPR, void_type_node, - TREE_VALUE (flt_node), NULL, lab); - VEC_safe_push (tree, heap, labels, t); - pointer_set_insert (seen_values, TREE_VALUE (flt_node)); + tree t = build_case_label (TREE_VALUE (flt_node), + NULL, lab); + labels.safe_push (t); + seen_values.add (TREE_VALUE (flt_node)); have_label = true; } @@ -3169,31 +3662,28 @@ /* Don't generate a switch if there's only a default case. This is common in the form of try { A; } catch (...) { B; }. */ - if (labels == NULL) + if (!labels.exists ()) { e = single_succ_edge (src); e->flags |= EDGE_FALLTHRU; } else { - fn = implicit_built_in_decls[BUILT_IN_EH_FILTER]; - x = gimple_build_call (fn, 1, build_int_cst (NULL, region_nr)); - filter = create_tmp_var (TREE_TYPE (TREE_TYPE (fn)), NULL); + fn = builtin_decl_implicit (BUILT_IN_EH_FILTER); + x = gimple_build_call (fn, 1, build_int_cst (integer_type_node, + region_nr)); + filter = create_tmp_var (TREE_TYPE (TREE_TYPE (fn))); filter = make_ssa_name (filter, x); gimple_call_set_lhs (x, filter); gsi_insert_before (&gsi, x, GSI_SAME_STMT); /* Turn the default label into a default case. */ - default_label = build3 (CASE_LABEL_EXPR, void_type_node, - NULL, NULL, default_label); + default_label = build_case_label (NULL, NULL, default_label); sort_case_labels (labels); - x = gimple_build_switch_vec (filter, default_label, labels); + x = gimple_build_switch (filter, default_label, labels); gsi_insert_before (&gsi, x, GSI_SAME_STMT); - - VEC_free (tree, heap, labels); } - pointer_set_destroy (seen_values); } break; @@ -3202,9 +3692,10 @@ edge b_e = BRANCH_EDGE (src); edge f_e = FALLTHRU_EDGE (src); - fn = implicit_built_in_decls[BUILT_IN_EH_FILTER]; - x = gimple_build_call (fn, 1, build_int_cst (NULL, region_nr)); - filter = create_tmp_var (TREE_TYPE (TREE_TYPE (fn)), NULL); + fn = builtin_decl_implicit (BUILT_IN_EH_FILTER); + x = gimple_build_call (fn, 1, build_int_cst (integer_type_node, + region_nr)); + filter = create_tmp_var (TREE_TYPE (TREE_TYPE (fn))); filter = make_ssa_name (filter, x); gimple_call_set_lhs (x, filter); gsi_insert_before (&gsi, x, GSI_SAME_STMT); @@ -3230,57 +3721,166 @@ return redirected; } -static unsigned -execute_lower_eh_dispatch (void) +namespace { + +const pass_data pass_data_lower_eh_dispatch = +{ + GIMPLE_PASS, /* type */ + "ehdisp", /* name */ + OPTGROUP_NONE, /* optinfo_flags */ + TV_TREE_EH, /* tv_id */ + PROP_gimple_lcf, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0, /* todo_flags_finish */ +}; + +class pass_lower_eh_dispatch : public gimple_opt_pass +{ +public: + pass_lower_eh_dispatch (gcc::context *ctxt) + : gimple_opt_pass (pass_data_lower_eh_dispatch, ctxt) + {} + + /* opt_pass methods: */ + virtual bool gate (function *fun) { return fun->eh->region_tree != NULL; } + virtual unsigned int execute (function *); + +}; // class pass_lower_eh_dispatch + +unsigned +pass_lower_eh_dispatch::execute (function *fun) { basic_block bb; - bool any_rewritten = false; + int flags = 0; bool redirected = false; assign_filter_values (); - FOR_EACH_BB (bb) + FOR_EACH_BB_FN (bb, fun) { - gimple last = last_stmt (bb); - if (last && gimple_code (last) == GIMPLE_EH_DISPATCH) + gimple *last = last_stmt (bb); + if (last == NULL) + continue; + if (gimple_code (last) == GIMPLE_EH_DISPATCH) { - redirected |= lower_eh_dispatch (bb, last); - any_rewritten = true; + redirected |= lower_eh_dispatch (bb, + as_a <geh_dispatch *> (last)); + flags |= TODO_update_ssa_only_virtuals; + } + else if (gimple_code (last) == GIMPLE_RESX) + { + if (stmt_can_throw_external (last)) + optimize_clobbers (bb); + else + flags |= sink_clobbers (bb); } } if (redirected) delete_unreachable_blocks (); - return any_rewritten ? TODO_update_ssa_only_virtuals : 0; + return flags; +} + +} // anon namespace + +gimple_opt_pass * +make_pass_lower_eh_dispatch (gcc::context *ctxt) +{ + return new pass_lower_eh_dispatch (ctxt); } - -static bool -gate_lower_eh_dispatch (void) -{ - return cfun->eh->region_tree != NULL; -} - -struct gimple_opt_pass pass_lower_eh_dispatch = + +/* Walk statements, see what regions and, optionally, landing pads + are really referenced. + + Returns in R_REACHABLEP an sbitmap with bits set for reachable regions, + and in LP_REACHABLE an sbitmap with bits set for reachable landing pads. + + Passing NULL for LP_REACHABLE is valid, in this case only reachable + regions are marked. + + The caller is responsible for freeing the returned sbitmaps. */ + +static void +mark_reachable_handlers (sbitmap *r_reachablep, sbitmap *lp_reachablep) { - { - GIMPLE_PASS, - "ehdisp", /* name */ - gate_lower_eh_dispatch, /* gate */ - execute_lower_eh_dispatch, /* 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_verify_flow /* todo_flags_finish */ - } -}; - -/* Walk statements, see what regions are really referenced and remove - those that are unused. */ + sbitmap r_reachable, lp_reachable; + basic_block bb; + bool mark_landing_pads = (lp_reachablep != NULL); + gcc_checking_assert (r_reachablep != NULL); + + r_reachable = sbitmap_alloc (cfun->eh->region_array->length ()); + bitmap_clear (r_reachable); + *r_reachablep = r_reachable; + + if (mark_landing_pads) + { + lp_reachable = sbitmap_alloc (cfun->eh->lp_array->length ()); + bitmap_clear (lp_reachable); + *lp_reachablep = lp_reachable; + } + else + lp_reachable = NULL; + + FOR_EACH_BB_FN (bb, cfun) + { + gimple_stmt_iterator gsi; + + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + + if (mark_landing_pads) + { + int lp_nr = lookup_stmt_eh_lp (stmt); + + /* Negative LP numbers are MUST_NOT_THROW regions which + are not considered BB enders. */ + if (lp_nr < 0) + bitmap_set_bit (r_reachable, -lp_nr); + + /* Positive LP numbers are real landing pads, and BB enders. */ + else if (lp_nr > 0) + { + gcc_assert (gsi_one_before_end_p (gsi)); + eh_region region = get_eh_region_from_lp_number (lp_nr); + bitmap_set_bit (r_reachable, region->index); + bitmap_set_bit (lp_reachable, lp_nr); + } + } + + /* Avoid removing regions referenced from RESX/EH_DISPATCH. */ + switch (gimple_code (stmt)) + { + case GIMPLE_RESX: + bitmap_set_bit (r_reachable, + gimple_resx_region (as_a <gresx *> (stmt))); + break; + case GIMPLE_EH_DISPATCH: + bitmap_set_bit (r_reachable, + gimple_eh_dispatch_region ( + as_a <geh_dispatch *> (stmt))); + break; + case GIMPLE_CALL: + if (gimple_call_builtin_p (stmt, BUILT_IN_EH_COPY_VALUES)) + for (int i = 0; i < 2; ++i) + { + tree rt = gimple_call_arg (stmt, i); + HOST_WIDE_INT ri = tree_to_shwi (rt); + + gcc_assert (ri == (int)ri); + bitmap_set_bit (r_reachable, ri); + } + break; + default: + break; + } + } + } +} + +/* Remove unreachable handlers and unreachable landing pads. */ static void remove_unreachable_handlers (void) @@ -3288,65 +3888,38 @@ sbitmap r_reachable, lp_reachable; eh_region region; eh_landing_pad lp; - basic_block bb; - int lp_nr, r_nr; - - r_reachable = sbitmap_alloc (VEC_length (eh_region, cfun->eh->region_array)); - lp_reachable - = sbitmap_alloc (VEC_length (eh_landing_pad, cfun->eh->lp_array)); - sbitmap_zero (r_reachable); - sbitmap_zero (lp_reachable); - - FOR_EACH_BB (bb) - { - gimple_stmt_iterator gsi = gsi_start_bb (bb); - - for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) - { - gimple stmt = gsi_stmt (gsi); - lp_nr = lookup_stmt_eh_lp (stmt); - - /* Negative LP numbers are MUST_NOT_THROW regions which - are not considered BB enders. */ - if (lp_nr < 0) - SET_BIT (r_reachable, -lp_nr); - - /* Positive LP numbers are real landing pads, are are BB enders. */ - else if (lp_nr > 0) - { - gcc_assert (gsi_one_before_end_p (gsi)); - region = get_eh_region_from_lp_number (lp_nr); - SET_BIT (r_reachable, region->index); - SET_BIT (lp_reachable, lp_nr); - } - } - } + unsigned i; + + mark_reachable_handlers (&r_reachable, &lp_reachable); 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, r_reachable); + dump_bitmap_file (dump_file, r_reachable); fprintf (dump_file, "Reachable landing pads: "); - dump_sbitmap_file (dump_file, lp_reachable); + dump_bitmap_file (dump_file, lp_reachable); } - for (r_nr = 1; - VEC_iterate (eh_region, cfun->eh->region_array, r_nr, region); ++r_nr) - if (region && !TEST_BIT (r_reachable, r_nr)) + if (dump_file) + { + FOR_EACH_VEC_SAFE_ELT (cfun->eh->region_array, i, region) + if (region && !bitmap_bit_p (r_reachable, region->index)) + fprintf (dump_file, + "Removing unreachable region %d\n", + region->index); + } + + remove_unreachable_eh_regions (r_reachable); + + FOR_EACH_VEC_SAFE_ELT (cfun->eh->lp_array, i, lp) + if (lp && !bitmap_bit_p (lp_reachable, lp->index)) { if (dump_file) - fprintf (dump_file, "Removing unreachable region %d\n", r_nr); - remove_eh_handler (region); - } - - for (lp_nr = 1; - VEC_iterate (eh_landing_pad, cfun->eh->lp_array, lp_nr, lp); ++lp_nr) - if (lp && !TEST_BIT (lp_reachable, lp_nr)) - { - if (dump_file) - fprintf (dump_file, "Removing unreachable landing pad %d\n", lp_nr); + fprintf (dump_file, + "Removing unreachable landing pad %d\n", + lp->index); remove_eh_landing_pad (lp); } @@ -3360,28 +3933,69 @@ sbitmap_free (r_reachable); sbitmap_free (lp_reachable); -#ifdef ENABLE_CHECKING - verify_eh_tree (cfun); -#endif + if (flag_checking) + verify_eh_tree (cfun); +} + +/* Remove unreachable handlers if any landing pads have been removed after + last ehcleanup pass (due to gimple_purge_dead_eh_edges). */ + +void +maybe_remove_unreachable_handlers (void) +{ + eh_landing_pad lp; + unsigned i; + + if (cfun->eh == NULL) + return; + + FOR_EACH_VEC_SAFE_ELT (cfun->eh->lp_array, i, lp) + if (lp && lp->post_landing_pad) + { + if (label_to_block (lp->post_landing_pad) == NULL) + { + remove_unreachable_handlers (); + return; + } + } } /* Remove regions that do not have landing pads. This assumes that remove_unreachable_handlers has already been run, and - that we've just manipulated the landing pads since then. */ + that we've just manipulated the landing pads since then. + + Preserve regions with landing pads and regions that prevent + exceptions from propagating further, even if these regions + are not reachable. */ static void remove_unreachable_handlers_no_lp (void) { - eh_region r; - int i; - - for (i = 1; VEC_iterate (eh_region, cfun->eh->region_array, i, r); ++i) - if (r && r->landing_pads == NULL && r->type != ERT_MUST_NOT_THROW) - { - if (dump_file) - fprintf (dump_file, "Removing unreachable region %d\n", i); - remove_eh_handler (r); - } + eh_region region; + sbitmap r_reachable; + unsigned i; + + mark_reachable_handlers (&r_reachable, /*lp_reachablep=*/NULL); + + FOR_EACH_VEC_SAFE_ELT (cfun->eh->region_array, i, region) + { + if (! region) + continue; + + if (region->landing_pads != NULL + || region->type == ERT_MUST_NOT_THROW) + bitmap_set_bit (r_reachable, region->index); + + if (dump_file + && !bitmap_bit_p (r_reachable, region->index)) + fprintf (dump_file, + "Removing unreachable region %d\n", + region->index); + } + + remove_unreachable_eh_regions (r_reachable); + + sbitmap_free (r_reachable); } /* Undo critical edge splitting on an EH landing pad. Earlier, we @@ -3407,10 +4021,10 @@ edge e_in, e_out; /* Quickly check the edge counts on BB for singularity. */ - if (EDGE_COUNT (bb->preds) != 1 || EDGE_COUNT (bb->succs) != 1) + if (!single_pred_p (bb) || !single_succ_p (bb)) return false; - e_in = EDGE_PRED (bb, 0); - e_out = EDGE_SUCC (bb, 0); + e_in = single_pred_edge (bb); + e_out = single_succ_edge (bb); /* Input edge must be EH and output edge must be normal. */ if ((e_in->flags & EDGE_EH) == 0 || (e_out->flags & EDGE_EH) != 0) @@ -3427,13 +4041,13 @@ for a different region. */ for (gsi = gsi_start_bb (e_out->dest); !gsi_end_p (gsi); gsi_next (&gsi)) { - gimple stmt = gsi_stmt (gsi); + glabel *label_stmt = dyn_cast <glabel *> (gsi_stmt (gsi)); tree lab; int lp_nr; - if (gimple_code (stmt) != GIMPLE_LABEL) + if (!label_stmt) break; - lab = gimple_label_label (stmt); + lab = gimple_label_label (label_stmt); lp_nr = EH_LANDING_PAD_NR (lab); if (lp_nr && get_eh_region_from_lp_number (lp_nr) != lp->region) return false; @@ -3450,9 +4064,10 @@ that doesn't appear to handle virtuals. Propagate by hand. */ if (!gimple_seq_empty_p (phi_nodes (bb))) { - for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); ) + for (gphi_iterator gpi = gsi_start_phis (bb); !gsi_end_p (gpi); ) { - gimple use_stmt, phi = gsi_stmt (gsi); + gimple *use_stmt; + gphi *phi = gpi.phi (); tree lhs = gimple_phi_result (phi); tree rhs = gimple_phi_arg_def (phi, 0); use_operand_p use_p; @@ -3467,7 +4082,7 @@ if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (lhs)) SSA_NAME_OCCURS_IN_ABNORMAL_PHI (rhs) = 1; - remove_phi_node (&gsi, true); + remove_phi_node (&gpi, true); } } @@ -3483,7 +4098,6 @@ redirect_edge_pred (e_out, e_in->src); e_out->flags = e_in->flags; e_out->probability = e_in->probability; - e_out->count = e_in->count; remove_edge (e_in); return true; @@ -3498,7 +4112,7 @@ eh_landing_pad lp; int i; - for (i = 1; VEC_iterate (eh_landing_pad, cfun->eh->lp_array, i, lp); ++i) + for (i = 1; vec_safe_iterate (cfun->eh->lp_array, i, &lp); ++i) if (lp) changed |= unsplit_eh (lp); @@ -3516,23 +4130,37 @@ cleanup_empty_eh_merge_phis (basic_block new_bb, basic_block old_bb, edge old_bb_out, bool change_region) { - gimple_stmt_iterator ngsi, ogsi; + gphi_iterator ngsi, ogsi; edge_iterator ei; edge e; - bitmap rename_virts; bitmap ophi_handled; + /* The destination block must not be a regular successor for any + of the preds of the landing pad. Thus, avoid turning + <..> + | \ EH + | <..> + | / + <..> + into + <..> + | | EH + <..> + which CFG verification would choke on. See PR45172 and PR51089. */ + FOR_EACH_EDGE (e, ei, old_bb->preds) + if (find_edge (e->src, new_bb)) + return false; + FOR_EACH_EDGE (e, ei, old_bb->preds) redirect_edge_var_map_clear (e); ophi_handled = BITMAP_ALLOC (NULL); - rename_virts = BITMAP_ALLOC (NULL); /* First, iterate through the PHIs on NEW_BB and set up the edge_var_map for the edges we're going to move. */ for (ngsi = gsi_start_phis (new_bb); !gsi_end_p (ngsi); gsi_next (&ngsi)) { - gimple ophi, nphi = gsi_stmt (ngsi); + gphi *ophi, *nphi = ngsi.phi (); tree nresult, nop; nresult = gimple_phi_result (nphi); @@ -3543,7 +4171,7 @@ ophi = NULL; for (ogsi = gsi_start_phis (old_bb); !gsi_end_p (ogsi); gsi_next (&ogsi)) { - ophi = gsi_stmt (ogsi); + ophi = ogsi.phi (); if (gimple_phi_result (ophi) == nop) break; ophi = NULL; @@ -3579,11 +4207,7 @@ redirect_edge_var_map_add (e, nresult, oop, oloc); } } - /* If we didn't find the PHI, but it's a VOP, remember to rename - it later, assuming all other tests succeed. */ - else if (!is_gimple_reg (nresult)) - bitmap_set_bit (rename_virts, SSA_NAME_VERSION (nresult)); - /* If we didn't find the PHI, and it's a real variable, we know + /* If we didn't find the PHI, if it's a real variable or a VOP, we know from the fact that OLD_BB is tree_empty_eh_handler_p that the variable is unchanged from input to the block and we can simply re-use the input to NEW_BB from the OLD_BB_OUT edge. */ @@ -3600,34 +4224,29 @@ we don't know what values from the other edges into NEW_BB to use. */ for (ogsi = gsi_start_phis (old_bb); !gsi_end_p (ogsi); gsi_next (&ogsi)) { - gimple ophi = gsi_stmt (ogsi); + gphi *ophi = ogsi.phi (); tree oresult = gimple_phi_result (ophi); if (!bitmap_bit_p (ophi_handled, SSA_NAME_VERSION (oresult))) goto fail; } - /* At this point we know that the merge will succeed. Remove the PHI - nodes for the virtuals that we want to rename. */ - if (!bitmap_empty_p (rename_virts)) - { - for (ngsi = gsi_start_phis (new_bb); !gsi_end_p (ngsi); ) - { - gimple nphi = gsi_stmt (ngsi); - tree nresult = gimple_phi_result (nphi); - if (bitmap_bit_p (rename_virts, SSA_NAME_VERSION (nresult))) - { - mark_virtual_phi_result_for_renaming (nphi); - remove_phi_node (&ngsi, true); - } - else - gsi_next (&ngsi); - } - } - /* Finally, move the edges and update the PHIs. */ for (ei = ei_start (old_bb->preds); (e = ei_safe_edge (ei)); ) if (e->flags & EDGE_EH) { + /* ??? CFG manipluation routines do not try to update loop + form on edge redirection. Do so manually here for now. */ + /* If we redirect a loop entry or latch edge that will either create + a multiple entry loop or rotate the loop. If the loops merge + we may have created a loop with multiple latches. + All of this isn't easily fixed thus cancel the affected loop + and mark the other loop as possibly having multiple latches. */ + if (e->dest == e->dest->loop_father->header) + { + mark_loop_for_removal (e->dest->loop_father); + new_bb->loop_father->latch = NULL; + loops_state_set (LOOPS_MAY_HAVE_MULTIPLE_LATCHES); + } redirect_eh_edge_1 (e, new_bb, change_region); redirect_edge_succ (e, new_bb); flush_pending_stmts (e); @@ -3636,14 +4255,12 @@ ei_next (&ei); BITMAP_FREE (ophi_handled); - BITMAP_FREE (rename_virts); return true; fail: FOR_EACH_EDGE (e, ei, old_bb->preds) redirect_edge_var_map_clear (e); BITMAP_FREE (ophi_handled); - BITMAP_FREE (rename_virts); return false; } @@ -3667,12 +4284,12 @@ /* Delete the RESX that was matched within the empty handler block. */ gsi = gsi_last_bb (bb); - mark_virtual_ops_for_renaming (gsi_stmt (gsi)); + unlink_stmt_vdef (gsi_stmt (gsi)); gsi_remove (&gsi, true); /* Clean up E_OUT for the fallthru. */ e_out->flags = (e_out->flags & ~EDGE_EH) | EDGE_FALLTHRU; - e_out->probability = REG_BR_PROB_BASE; + e_out->probability = profile_probability::always (); } /* A subroutine of cleanup_empty_eh. Handle more complex cases of @@ -3684,8 +4301,6 @@ { gimple_stmt_iterator gsi; tree lab; - edge_iterator ei; - edge e; /* We really ought not have totally lost everything following a landing pad label. Given that BB is empty, there had better @@ -3697,10 +4312,10 @@ lab = NULL; for (gsi = gsi_start_bb (e_out->dest); !gsi_end_p (gsi); gsi_next (&gsi)) { - gimple stmt = gsi_stmt (gsi); + glabel *stmt = dyn_cast <glabel *> (gsi_stmt (gsi)); int lp_nr; - if (gimple_code (stmt) != GIMPLE_LABEL) + if (!stmt) break; lab = gimple_label_label (stmt); lp_nr = EH_LANDING_PAD_NR (lab); @@ -3708,22 +4323,6 @@ return false; } - /* The destination block must not be a regular successor for any - of the preds of the landing pad. Thus, avoid turning - <..> - | \ EH - | <..> - | / - <..> - into - <..> - | | EH - <..> - which CFG verification would choke on. See PR45172. */ - FOR_EACH_EDGE (e, ei, bb->preds) - if (find_edge (e->src, e_out->dest)) - return false; - /* Attempt to move the PHIs into the successor block. */ if (cleanup_empty_eh_merge_phis (e_out->dest, bb, e_out, false)) { @@ -3784,11 +4383,12 @@ { basic_block bb = label_to_block (lp->post_landing_pad); gimple_stmt_iterator gsi; - gimple resx; + gimple *resx; eh_region new_region; edge_iterator ei; edge e, e_out; bool has_non_eh_pred; + bool ret = false; int new_lp_nr; /* There can be zero or one edges out of BB. This is the quickest test. */ @@ -3798,11 +4398,22 @@ e_out = NULL; break; case 1: - e_out = EDGE_SUCC (bb, 0); + e_out = single_succ_edge (bb); break; default: return false; } + + gsi = gsi_last_nondebug_bb (bb); + resx = gsi_stmt (gsi); + if (resx && is_gimple_resx (resx)) + { + if (stmt_can_throw_external (resx)) + optimize_clobbers (bb); + else if (sink_clobbers (bb)) + ret = true; + } + gsi = gsi_after_labels (bb); /* Make sure to skip debug statements. */ @@ -3812,18 +4423,28 @@ /* If the block is totally empty, look for more unsplitting cases. */ if (gsi_end_p (gsi)) { - /* For the degenerate case of an infinite loop bail out. */ - if (infinite_empty_loop_p (e_out)) - return false; - - return cleanup_empty_eh_unsplit (bb, e_out, lp); + /* For the degenerate case of an infinite loop bail out. + If bb has no successors and is totally empty, which can happen e.g. + because of incorrect noreturn attribute, bail out too. */ + if (e_out == NULL + || infinite_empty_loop_p (e_out)) + return ret; + + return ret | cleanup_empty_eh_unsplit (bb, e_out, lp); } - /* The block should consist only of a single RESX statement. */ + /* The block should consist only of a single RESX statement, modulo a + preceding call to __builtin_stack_restore if there is no outgoing + edge, since the call can be eliminated in this case. */ resx = gsi_stmt (gsi); + if (!e_out && gimple_call_builtin_p (resx, BUILT_IN_STACK_RESTORE)) + { + gsi_next_nondebug (&gsi); + resx = gsi_stmt (gsi); + } if (!is_gimple_resx (resx)) - return false; - gcc_assert (gsi_one_before_end_p (gsi)); + return ret; + gcc_assert (gsi_one_nondebug_before_end_p (gsi)); /* Determine if there are non-EH edges, or resx edges into the handler. */ has_non_eh_pred = false; @@ -3846,7 +4467,7 @@ for (ei = ei_start (bb->preds); (e = ei_safe_edge (ei)); ) if (e->flags & EDGE_EH) { - gimple stmt = last_stmt (e->src); + gimple *stmt = last_stmt (e->src); remove_stmt_from_eh_lp (stmt); remove_edge (e); } @@ -3862,7 +4483,7 @@ for (ei = ei_start (bb->preds); (e = ei_safe_edge (ei)); ) if (e->flags & EDGE_EH) { - gimple stmt = last_stmt (e->src); + gimple *stmt = last_stmt (e->src); remove_stmt_from_eh_lp (stmt); add_stmt_to_eh_lp (stmt, new_lp_nr); remove_edge (e); @@ -3898,7 +4519,7 @@ return true; } - return false; + return ret; succeed: if (dump_file && (dump_flags & TDF_DETAILS)) @@ -3917,7 +4538,7 @@ eh_landing_pad lp; int i; - for (i = 1; VEC_iterate (eh_landing_pad, cfun->eh->lp_array, i, lp); ++i) + for (i = 1; vec_safe_iterate (cfun->eh->lp_array, i, &lp); ++i) if (lp) changed |= cleanup_empty_eh (lp); @@ -3929,7 +4550,7 @@ 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. + 4) Eh tree is pruned for regions no longer necessary. TODO: Push MUST_NOT_THROW regions to the root of the EH tree. Unify those that have the same failure decl and locus. @@ -3943,11 +4564,12 @@ remove_unreachable_handlers (); /* Watch out for the region tree vanishing due to all unreachable. */ - if (cfun->eh->region_tree && optimize) + if (cfun->eh->region_tree) { bool changed = false; - changed |= unsplit_all_eh (); + if (optimize) + changed |= unsplit_all_eh (); changed |= cleanup_all_empty_eh (); if (changed) @@ -3970,8 +4592,41 @@ return 0; } -static unsigned int -execute_cleanup_eh (void) +namespace { + +const pass_data pass_data_cleanup_eh = +{ + GIMPLE_PASS, /* type */ + "ehcleanup", /* name */ + OPTGROUP_NONE, /* optinfo_flags */ + TV_TREE_EH, /* tv_id */ + PROP_gimple_lcf, /* properties_required */ + 0, /* properties_provided */ + 0, /* properties_destroyed */ + 0, /* todo_flags_start */ + 0, /* todo_flags_finish */ +}; + +class pass_cleanup_eh : public gimple_opt_pass +{ +public: + pass_cleanup_eh (gcc::context *ctxt) + : gimple_opt_pass (pass_data_cleanup_eh, ctxt) + {} + + /* opt_pass methods: */ + opt_pass * clone () { return new pass_cleanup_eh (m_ctxt); } + virtual bool gate (function *fun) + { + return fun->eh != NULL && fun->eh->region_tree != NULL; + } + + virtual unsigned int execute (function *); + +}; // class pass_cleanup_eh + +unsigned int +pass_cleanup_eh::execute (function *fun) { int ret = execute_cleanup_eh_1 (); @@ -3979,41 +4634,25 @@ clear it. This exposes cross-language inlining opportunities and avoids references to a never defined personality routine. */ if (DECL_FUNCTION_PERSONALITY (current_function_decl) - && function_needs_eh_personality (cfun) != eh_personality_lang) + && function_needs_eh_personality (fun) != eh_personality_lang) DECL_FUNCTION_PERSONALITY (current_function_decl) = NULL_TREE; return ret; } -static bool -gate_cleanup_eh (void) +} // anon namespace + +gimple_opt_pass * +make_pass_cleanup_eh (gcc::context *ctxt) { - return cfun->eh != NULL && cfun->eh->region_tree != NULL; + return new pass_cleanup_eh (ctxt); } - -struct gimple_opt_pass pass_cleanup_eh = { - { - GIMPLE_PASS, - "ehcleanup", /* name */ - gate_cleanup_eh, /* gate */ - execute_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 */ - } -}; /* Verify that BB containing STMT as the last statement, has precisely the edge that make_eh_edges would create. */ DEBUG_FUNCTION bool -verify_eh_edges (gimple stmt) +verify_eh_edges (gimple *stmt) { basic_block bb = gimple_bb (stmt); eh_landing_pad lp = NULL; @@ -4074,7 +4713,7 @@ /* Similarly, but handle GIMPLE_EH_DISPATCH specifically. */ DEBUG_FUNCTION bool -verify_eh_dispatch_edge (gimple stmt) +verify_eh_dispatch_edge (geh_dispatch *stmt) { eh_region r; eh_catch c;