CbC/CbC_gcc: gcc/tree-eh.c comparison

comparison gcc/tree-eh.c @ 111:04ced10e8804

gcc 7

author	kono
date	Fri, 27 Oct 2017 22:46:09 +0900
parents	f6334be47118
children	84e7813d76e9

comparison

equal deleted inserted replaced

-:561a7518be6b
+:04ced10e8804
 /* Exception handling semantics and decomposition for trees.
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2003-2017 Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 <http://www.gnu.org/licenses/>.  */
 #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 "gimple.h"
-#include "function.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 "cfganal.h"
-#include "tree-flow.h"
+#include "cfgcleanup.h"
-#include "tree-dump.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 "cfgloop.h"
-#include "diagnostic-core.h"
+#include "gimple-low.h"
-#include "gimple.h"
+#include "stringpool.h"
-#include "target.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;
+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;
-}
 /* 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:
 compared to those that can.  We should be saving some amount
 of space by only allocating memory for those that can throw.  */
 /* Add statement T in function IFUN to landing pad NUM.  */
+static void
+add_stmt_to_eh_lp_fn (struct function *ifun, gimple *t, int num)
+{
+gcc_assert (num != 0);
+if (!get_eh_throw_stmt_table (ifun))
+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_fn (struct function *ifun, gimple t, int num)
+add_stmt_to_eh_lp (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;
-}
-/* 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_fn (cfun, t, num);
 }
 /* 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;
 if (region->type == ERT_MUST_NOT_THROW)
 add_stmt_to_eh_lp_fn (cfun, t, -region->index);
 /* 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;
+if (!get_eh_throw_stmt_table (ifun)->get (t))
-slot = htab_find_slot (get_eh_throw_stmt_table (ifun), &dummy,
+return false;
-NO_INSERT);
-if (slot)
+get_eh_throw_stmt_table (ifun)->remove (t);
-{
-htab_clear_slot (get_eh_throw_stmt_table (ifun), slot);
 return true;
-}
-else
-return false;
 }
 /* Remove statement T in the current function (cfun) from its
 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);
 }
 /* Determine if statement T is inside an EH region in function IFUN.
 Positive numbers indicate a landing pad index; negative numbers
 indicate a MUST_NOT_THROW region index; zero indicates that the
 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;
+int *lp_nr = ifun->eh->throw_stmt_table->get (t);
-p = (struct throw_stmt_node *) htab_find (ifun->eh->throw_stmt_table, &n);
+return lp_nr ? *lp_nr : 0;
-return p ? p->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.  */
 if (!cfun)
 return 0;
 /* When storing a GIMPLE_TRY, we have to record a gimple.  However
 when deciding whether a GOTO to a certain LABEL_DECL (which is a
 tree) leaves the TRY block, its necessary to record a tree in
 this field.  Thus a treemple is used. */
 treemple child;
-gimple parent;
+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;
 for (gsi = gsi_start (seq); !gsi_end_p (gsi); gsi_next (&gsi))
 collect_finally_tree (gsi_stmt (gsi), region);
 }
 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;
 case GIMPLE_TRY:
 if (gimple_try_kind (stmt) == GIMPLE_TRY_FINALLY)
 {
 temp.g = stmt;
 record_in_finally_tree (temp, region);
-collect_finally_tree_1 (gimple_try_eval (stmt), stmt);
+collect_finally_tree_1 (gimple_try_eval (stmt),
+				  as_a <gtry *> (stmt));
 	  collect_finally_tree_1 (gimple_try_cleanup (stmt), region);
 }
 else if (gimple_try_kind (stmt) == GIMPLE_TRY_CATCH)
 {
 collect_finally_tree_1 (gimple_try_eval (stmt), region);
 collect_finally_tree_1 (gimple_try_cleanup (stmt), region);
 }
 break;
 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.  */
 /* Use the finally tree to determine if a jump from START to TARGET
 would leave the try_finally node that START lives in.  */
 static bool
-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;
 }
 while (start.g != target);
 /* Record whether an EH region contains something that can throw,
 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
 of type 'tree', we need this node to store both gimple and tree
 objects.  REPL_STMT is the sequence used to replace the goto/return
 the return/goto to jump to the original destination. */
 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).  */
 int is_label;
 };
 {
 /* Pointer to the GIMPLE_TRY_FINALLY node under discussion.  The
 try_finally_expr is the original GIMPLE_TRY_FINALLY.  We need to retain
 this so that outside_finally_tree can reliably reference the tree used
 in the collect_finally_tree data structures.  */
-gimple try_finally_expr;
+gtry *try_finally_expr;
-gimple top_p;
+gtry *top_p;
 /* While lowering a top_p usually it is expanded into multiple statements,
 thus we need the following field to store them. */
 gimple_seq top_p_seq;
 struct goto_queue_node *goto_queue;
 size_t goto_queue_size;
 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*,
 though subsequent transformations may have cleared that flag.  */
 tree fallthru_label;
 /* True if the finally block can receive an exception edge.
 Cleared if the exception case is handled by code duplication.  */
 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)
 {
 for (i = 0; i < tf->goto_queue_active; i++)
 	if ( tf->goto_queue[i].stmt.g == stmt.g)
 /* If we have a large number of entries in the goto_queue, create a
 pointer map and use that for searching.  */
 if (!tf->goto_queue_map)
 {
-tf->goto_queue_map = pointer_map_create ();
+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,
+	  bool existed = tf->goto_queue_map->put (tf->goto_queue[i].stmt.g,
-tf->goto_queue[i].stmt.g);
+						  &tf->goto_queue[i]);
-gcc_assert (*slot == NULL);
+	  gcc_assert (!existed);
-	  *slot = &tf->goto_queue[i];
+	}
-	}
+}
-}
+goto_queue_node **slot = tf->goto_queue_map->get (stmt.g);
-slot = pointer_map_contains (tf->goto_queue_map, stmt.g);
 if (slot != NULL)
-return (((struct goto_queue_node *) *slot)->repl_stmt);
+return ((*slot)->repl_stmt);
 return NULL;
 }
 /* A subroutine of replace_goto_queue_1.  Handles the sub-clauses of a
 }
 /* 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;
 treemple temp;
 temp.g = NULL;
 replace_goto_queue_cond_clause (gimple_op_ptr (stmt, 2), tf, gsi);
 replace_goto_queue_cond_clause (gimple_op_ptr (stmt, 3), tf, gsi);
 break;
 case GIMPLE_TRY:
-replace_goto_queue_stmt_list (gimple_try_eval (stmt), tf);
+replace_goto_queue_stmt_list (gimple_try_eval_ptr (stmt), tf);
-replace_goto_queue_stmt_list (gimple_try_cleanup (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:
 /* These won't have gotos in them.  */
 break;
 }
 /* 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);
 }
 static void
 replace_goto_queue (struct leh_tf_state *tf)
 {
 if (tf->goto_queue_active == 0)
 return;
-replace_goto_queue_stmt_list (tf->top_p_seq, tf);
+replace_goto_queue_stmt_list (&tf->top_p_seq, tf);
-replace_goto_queue_stmt_list (eh_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
 data to be added, IS_LABEL indicates whether NEW_STMT is a label or
 a gimple return. */
 static void
 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;
 gcc_assert (!tf->goto_queue_map);
 tf->goto_queue_active = active + 1;
 memset (q, 0, sizeof (*q));
 q->stmt = new_stmt;
 q->index = index;
+q->location = location;
 q->is_label = is_label;
 }
 /* Record the LABEL label in the goto queue contained in TF.
 TF is not null.  */
 static void
-record_in_goto_queue_label (struct leh_tf_state *tf, treemple stmt, tree label)
+record_in_goto_queue_label (struct leh_tf_state *tf, treemple stmt, tree label,
+			    location_t location)
 {
 int index;
 treemple temp, new_stmt;
 if (!label)
 /* No need to record gotos that don't leave the try block.  */
 temp.t = label;
 if (!outside_finally_tree (temp, tf->try_finally_expr))
 return;
-if (! tf->dest_array)
+if (! tf->dest_array.exists ())
 {
-tf->dest_array = VEC_alloc (tree, heap, 10);
+tf->dest_array.create (10);
-VEC_quick_push (tree, tf->dest_array, label);
+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
 node, and if so record that fact in the goto queue associated with that
 try_finally node.  */
 static void
-maybe_record_in_goto_queue (struct leh_state *state, gimple stmt)
+maybe_record_in_goto_queue (struct leh_state *state, gimple *stmt)
 {
 struct leh_tf_state *tf = state->tf;
 treemple new_stmt;
 if (!tf)
 return;
 switch (gimple_code (stmt))
 {
 case GIMPLE_COND:
-new_stmt.tp = gimple_op_ptr (stmt, 2);
+{
-record_in_goto_queue_label (tf, new_stmt, gimple_cond_true_label (stmt));
+	gcond *cond_stmt = as_a <gcond *> (stmt);
-new_stmt.tp = gimple_op_ptr (stmt, 3);
+	new_stmt.tp = gimple_op_ptr (cond_stmt, 2);
-record_in_goto_queue_label (tf, new_stmt, gimple_cond_false_label (stmt));
+	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:
 gcc_unreachable ();
 }
 }
-#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;
 if (!tf)
 }
 #else
 #define verify_norecord_switch_expr(state, switch_expr)
 #endif
-/* Redirect a RETURN_EXPR pointed to by STMT_P to FINLAB.  Place in CONT_P
+/* Redirect a RETURN_EXPR pointed to by Q to FINLAB.  If MOD is
-whatever is needed to finish the return.  If MOD is non-null, insert it
+non-null, insert it before the new branch.  */
-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.  */
 static void
-do_return_redirection (struct goto_queue_node *q, tree finlab, gimple_seq mod,
+do_return_redirection (struct goto_queue_node *q, tree finlab, gimple_seq mod)
-		       tree *return_value_p)
+{
-{
+gimple *x;
-tree ret_expr;
-gimple x;
+/* In the case of a return, the queue node must be a gimple statement.  */
-/* 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);
+/* Note that the return value may have already been computed, e.g.,
-if (ret_expr)
+	int x;
-{
+	int foo (void)
-if (!*return_value_p)
+	{
-*return_value_p = ret_expr;
+	  x = 0;
-else
+	  try {
-gcc_assert (*return_value_p == ret_expr);
+	    return x;
-q->cont_stmt = q->stmt.g;
+	  } finally {
-/* The nasty part about redirecting the return value is that the
+	    x++;
-	 return value itself is to be computed before the FINALLY block
+	  }
-	 is executed.  e.g.
+	}
-		int x;
+should return 0, not 1.  We don't have to do anything to make
-		int foo (void)
+this happens because the return value has been placed in the
-		{
+RESULT_DECL already.  */
-		  x = 0;
-		  try {
+q->cont_stmt = q->stmt.g;
-		    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)
-	{
-	  if (!*return_value_p)
-	    *return_value_p = ret_expr;
-	  else
-	    gcc_assert (*return_value_p == ret_expr);
-	  q->cont_stmt = q->stmt.g;
-	}
-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 ();
 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);
 }
 /* Similar, but easier, for GIMPLE_GOTO.  */
 static void
 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 (tf->dest_array[q->index]);
-q->cont_stmt = gimple_build_goto (VEC_index (tree, 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);
 }
 /* Emit a standard landing pad sequence into SEQ for REGION.  */
 static void
 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);
 lp->post_landing_pad = create_artificial_label (UNKNOWN_LOCATION);
 /* Emit a RESX statement into SEQ for REGION.  */
 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);
 }
 /* Emit an EH_DISPATCH statement into SEQ for REGION.  */
 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);
 }
 /* Note that the current EH region may contain a throw, or a
 call to a function which itself may contain a throw.  */
 static void
 note_eh_region_may_contain_throw (eh_region region)
 {
 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;
 }
 }
 }
 /* We want to transform
 	try { body; } catch { stuff; }
 to
-	normal_seqence:
+	normal_sequence:
 	  body;
 	  over:
-	eh_seqence:
+	eh_sequence:
 	  landing_pad:
 	  stuff;
 	  goto over;
 TP is a GIMPLE_TRY node.  REGION is the region whose post_landing_pad
 should be placed before the second operand, or NULL.  OVER is
 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);
 cleanup = gimple_try_cleanup (tp);
 result = gimple_try_eval (tp);
 if (gimple_seq_may_fallthru (cleanup))
 {
 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);
 if (over)
 /* A subroutine of lower_try_finally.  Duplicate the tree rooted at T.
 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);
 }
 }
 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
 the finally block may not itself throw an exception.  We have two choices
 here. First we can duplicate the finally block and wrap it in a
 static void
 honor_protect_cleanup_actions (struct leh_state *outer_state,
 			       struct leh_state *this_state,
 			       struct leh_tf_state *tf)
 {
-tree protect_cleanup_actions;
+gimple_seq finally = gimple_try_cleanup (tf->top_p);
-gimple_stmt_iterator gsi;
-bool finally_may_fallthru;
+/* EH_ELSE doesn't come from user code; only compiler generated stuff.
-gimple_seq finally;
+It does need to be handled here, so as to separate the (different)
-gimple x;
+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).  */
-/* First check for nothing to do.  */
+if (geh_else *eh_else = get_eh_else (finally))
-if (lang_hooks.eh_protect_cleanup_actions == NULL)
+{
-return;
+gimple_try_set_cleanup (tf->top_p, gimple_eh_else_n_body (eh_else));
-protect_cleanup_actions = lang_hooks.eh_protect_cleanup_actions ();
+finally = gimple_eh_else_e_body (eh_else);
-if (protect_cleanup_actions == NULL)
-return;
+/* Let the ELSE see the exception that's being processed.  */
+eh_region save_ehp = this_state->ehp_region;
-finally = gimple_try_cleanup (tf->top_p);
+this_state->ehp_region = this_state->cur_region;
-finally_may_fallthru = gimple_seq_may_fallthru (finally);
+lower_eh_constructs_1 (this_state, &finally);
+this_state->ehp_region = save_ehp;
-/* Duplicate the FINALLY block.  Only need to do this for try-finally,
+}
-and not for cleanups.  */
+else
-if (this_state)
+{
-finally = lower_try_finally_dup_block (finally, outer_state);
+/* First check for nothing to do.  */
+if (lang_hooks.eh_protect_cleanup_actions == NULL)
-/* If this cleanup consists of a TRY_CATCH_EXPR with TRY_CATCH_IS_CLEANUP
+	return;
-set, the handler of the TRY_CATCH_EXPR is another cleanup which ought
+tree actions = lang_hooks.eh_protect_cleanup_actions ();
-to be in an enclosing scope, but needs to be implemented at this level
+if (actions == NULL)
-to avoid a nesting violation (see wrap_temporary_cleanups in
+	return;
-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
+if (this_state)
-MUST_NOT_THROW filter.  */
+	finally = lower_try_finally_dup_block (finally, outer_state,
-gsi = gsi_start (finally);
+	  gimple_location (tf->try_finally_expr));
-x = gsi_stmt (gsi);
-if (gimple_code (x) == GIMPLE_TRY
+/* If this cleanup consists of a TRY_CATCH_EXPR with TRY_CATCH_IS_CLEANUP
-&& gimple_try_kind (x) == GIMPLE_TRY_CATCH
+	 set, the handler of the TRY_CATCH_EXPR is another cleanup which ought
-&& gimple_try_catch_is_cleanup (x))
+	 to be in an enclosing scope, but needs to be implemented at this level
-{
+	 to avoid a nesting violation (see wrap_temporary_cleanups in
-gsi_insert_seq_before (&gsi, gimple_try_eval (x), GSI_SAME_STMT);
+	 cp/decl.c).  Since it's logically at an outer level, we should call
-gsi_remove (&gsi, false);
+	 terminate before we get to it, so strip it away before adding the
-}
+	 MUST_NOT_THROW filter.  */
+gimple_stmt_iterator gsi = gsi_start (finally);
-/* Wrap the block with protect_cleanup_actions as the action.  */
+gimple *x = gsi_stmt (gsi);
-x = gimple_build_eh_must_not_throw (protect_cleanup_actions);
+if (gimple_code (x) == GIMPLE_TRY
-x = gimple_build_try (finally, gimple_seq_alloc_with_stmt (x),
+	  && gimple_try_kind (x) == GIMPLE_TRY_CATCH
-			GIMPLE_TRY_CATCH);
+	  && gimple_try_catch_is_cleanup (x))
-finally = lower_eh_must_not_throw (outer_state, 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);
+}
 /* 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
 the rest of the outgoing edges.  */
 tf->may_throw = false;
 static void
 lower_try_finally_nofallthru (struct leh_state *state,
 			      struct leh_tf_state *tf)
 {
-tree lab, return_val;
+tree lab;
-gimple x;
+gimple *x;
+geh_else *eh_else;
 gimple_seq finally;
 struct goto_queue_node *q, *qe;
 lab = create_artificial_label (gimple_location (tf->try_finally_expr));
 tf->top_p_seq = gimple_try_eval (tf->top_p);
 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);
+/* Emit the finally block into the stream.  Lower EH_ELSE at this time.  */
-gimple_seq_add_seq (&tf->top_p_seq, finally);
+eh_else = get_eh_else (finally);
+if (eh_else)
-if (tf->may_throw)
+{
-{
+finally = gimple_eh_else_n_body (eh_else);
-emit_post_landing_pad (&eh_seq, tf->region);
+lower_eh_constructs_1 (state, &finally);
+gimple_seq_add_seq (&tf->top_p_seq, finally);
-x = gimple_build_goto (lab);
-gimple_seq_add_stmt (&eh_seq, x);
+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);
+	}
 }
 }
 /* A subroutine of lower_try_finally.  We have determined that there is
 exactly one destination of the finally block.  Restructure the
 static void
 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)
 {
 /* Only reachable via the exception edge.  Add the given label to
 the head of the FINALLY block.  Append a RESX at the end.  */
 gimple_seq_add_seq (&tf->top_p_seq, finally);
 return;
 }
 finally_label = create_artificial_label (loc);
-x = gimple_build_label (finally_label);
+label_stmt = gimple_build_label (finally_label);
-gimple_seq_add_stmt (&tf->top_p_seq, x);
+gimple_seq_add_stmt (&tf->top_p_seq, label_stmt);
 gimple_seq_add_seq (&tf->top_p_seq, finally);
 q = tf->goto_queue;
 qe = q + tf->goto_queue_active;
 if (tf->may_return)
 {
 /* Reachable by return expressions only.  Redirect them.  */
-tree return_val = NULL;
 for (; q < qe; ++q)
-	do_return_redirection (q, finally_label, NULL, &return_val);
+	do_return_redirection (q, finally_label, NULL);
 replace_goto_queue (tf);
 }
 else
 {
 /* Reachable by goto expressions only.  Redirect them.  */
 for (; q < qe; ++q)
 	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
 	     emit the final branch out, or the fallthru label.  */
 	  tf->fallthru_label = NULL;
 lower_try_finally_copy (struct leh_state *state, struct leh_tf_state *tf)
 {
 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);
+seq = lower_try_finally_dup_block (finally, state, tf_loc);
-lower_eh_constructs_1 (state, seq);
+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);
+/* We don't need to copy the EH path of EH_ELSE,
-lower_eh_constructs_1 (state, seq);
+	 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);
 emit_resx (&eh_seq, tf->region);
 }
 if (tf->goto_queue)
 {
 struct goto_queue_node *q, *qe;
-tree return_val = NULL;
 int return_index, index;
 struct labels_s
 {
 	struct goto_queue_node *q;
 	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;
 qe = q + tf->goto_queue_active;
 for (; q < qe; q++)
 	  lab = labels[index].label
 	    = 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);
+	  seq = lower_try_finally_dup_block (finally, state, q->location);
-	  lower_eh_constructs_1 (state, seq);
+	  lower_eh_constructs_1 (state, &seq);
 gimple_seq_add_seq (&new_stmt, seq);
 gimple_seq_add_stmt (&new_stmt, q->cont_stmt);
 	  maybe_record_in_goto_queue (state, q->cont_stmt);
 	}
 	    continue;
 	  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);
 	}
 replace_goto_queue (tf);
 static void
 lower_try_finally_switch (struct leh_state *state, struct leh_tf_state *tf)
 {
 struct goto_queue_node *q, *qe;
-tree return_val = NULL;
 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;
+auto_vec<tree> case_label_vec;
-gimple_seq switch_body;
+gimple_seq switch_body = NULL;
-gimple x;
+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 ?
+x = gimple_seq_last_stmt (finally);
-gimple_location (gimple_seq_last_stmt (tf->top_p_seq))
+finally_loc = x ? gimple_location (x) : tf_loc;
-: tf_loc;
-/* Lower the finally block itself.  */
-lower_eh_constructs_1 (state, finally);
 /* 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,
+tmp = build_int_cst (integer_type_node, fallthru_index);
-			  build_int_cst (NULL, fallthru_index),
+last_case = build_case_label (tmp, NULL,
-			  NULL, create_artificial_label (tf_loc));
+				    create_artificial_label (finally_loc));
-VEC_quick_push (tree, case_label_vec, last_case);
+case_label_vec.quick_push (last_case);
 last_case_index++;
 x = gimple_build_label (CASE_LABEL (last_case));
 gimple_seq_add_stmt (&switch_body, x);
 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,
+tmp = build_int_cst (integer_type_node, eh_index);
-			  build_int_cst (NULL, eh_index),
+last_case = build_case_label (tmp, NULL,
-			  NULL, create_artificial_label (tf_loc));
+				    create_artificial_label (tf_loc));
-VEC_quick_push (tree, case_label_vec, last_case);
+case_label_vec.quick_push (last_case);
 last_case_index++;
 x = gimple_build_label (CASE_LABEL (last_case));
 gimple_seq_add_stmt (&eh_seq, x);
 emit_resx (&eh_seq, tf->region);
 }
 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.  */
 q = tf->goto_queue;
 qe = q + tf->goto_queue_active;
 j = last_case_index + tf->may_return;
 /* Prepare the assignments to finally_tmp that are executed upon the
 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
+if (case_label_vec.length () <= case_index || !case_label_vec[case_index])
-|| !VEC_index (tree, case_label_vec, case_index))
 {
 tree case_lab;
-void **slot;
+	  tmp = build_int_cst (integer_type_node, switch_id);
-case_lab = build3 (CASE_LABEL_EXPR, void_type_node,
+case_lab = build_case_label (tmp, NULL,
-build_int_cst (NULL, switch_id),
+				       create_artificial_label (tf_loc));
-			     NULL, NULL);
 /* We store the cont_stmt in the pointer map, so that we can recover
-it in the loop below.  We don't create the new label while
+it in the loop below.  */
-walking the goto_queue because pointers don't offer a stable
-order.  */
 if (!cont_map)
-cont_map = pointer_map_create ();
+	    cont_map = new hash_map<tree, gimple *>;
-slot = pointer_map_insert (cont_map, case_lab);
+cont_map->put (case_lab, q->cont_stmt);
-*slot = q->cont_stmt;
+case_label_vec.quick_push (case_lab);
-VEC_quick_push (tree, case_label_vec, case_lab);
 }
 }
 for (j = last_case_index; j < last_case_index + nlabels; j++)
 {
-tree label;
+gimple *cont_stmt;
-gimple cont_stmt;
-void **slot;
+last_case = case_label_vec[j];
-last_case = VEC_index (tree, case_label_vec, j);
 gcc_assert (last_case);
 gcc_assert (cont_map);
-slot = pointer_map_contains (cont_map, last_case);
+cont_stmt = *cont_map->get (last_case);
-/* As the comment above suggests, CASE_LABEL (last_case) was just a
-placeholder, it does not store an actual label, yet. */
+x = gimple_build_label (CASE_LABEL (last_case));
-gcc_assert (slot);
-cont_stmt = *(gimple *) slot;
-label = create_artificial_label (tf_loc);
-CASE_LABEL (last_case) = label;
-x = gimple_build_label (label);
 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,
+switch_stmt = gimple_build_switch (finally_tmp, last_case,
-case_label_vec);
+				     case_label_vec);
 gimple_set_location (switch_stmt, finally_loc);
 /* Need to link SWITCH_STMT after running replace_goto_queue
 due to not wanting to process the same goto stmts twice.  */
 gimple_seq_add_stmt (&tf->top_p_seq, switch_stmt);
 }
 /* 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.  */
 sw_estimate = 10 + 2 * ndests;
 to a sequence of labels and blocks, plus the exception region trees
 that record all the magic.  This is complicated by the need to
 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;
 int ndests;
 gimple_seq old_eh_seq;
 memset (&this_tf, 0, sizeof (this_tf));
 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;
 }
 else
 this_state.tf = &this_tf;
 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));
 /* Determine if any exceptions are possible within the try block.  */
 /* Determine how many edges (still) reach the finally block.  Or rather,
 how many destinations are reached by the finally block.  Use this to
 determine how we process the finally block itself.  */
-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;
 /* If the FINALLY block is not reachable, dike it out.  */
 lower_try_finally_nofallthru (state, &this_tf);
 /* We can easily special-case redirection to a single destination.  */
 else if (ndests == 1)
 lower_try_finally_onedest (state, &this_tf);
-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);
 /* If someone requested we add a label at the end of the transformed
 block, do so.  */
 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);
+this_tf.dest_array.release ();
-if (this_tf.goto_queue)
+free (this_tf.goto_queue);
-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.  */
 if (old_eh_seq)
 {
 	eh_seq = old_eh_seq;
 else
 	{
 	  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);
 	}
 }
 return this_tf.top_p_seq;
 }
 /* A subroutine of lower_eh_constructs_1.  Lower a GIMPLE_TRY_CATCH with a
 list of GIMPLE_CATCH to a sequence of labels and blocks, plus the
 exception region trees that records all the magic.  */
 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_seq new_seq, cleanup;
-gimple x;
+gimple *x;
 location_t try_catch_loc = gimple_location (tp);
 if (flag_exceptions)
 {
 try_region = gen_eh_region_try (state->cur_region);
 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);
 new_seq = NULL;
 emit_resx (&new_seq, try_region);
 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);
+catch_stmt = as_a <gcatch *> (gsi_stmt (gsi));
-c = gen_eh_region_catch (try_region, gimple_catch_types (gcatch));
+c = gen_eh_region_catch (try_region, gimple_catch_types (catch_stmt));
-handler = gimple_catch_handler (gcatch);
+handler = gimple_catch_handler (catch_stmt);
-lower_eh_constructs_1 (&this_state, handler);
+lower_eh_constructs_1 (&this_state, &handler);
 c->label = create_artificial_label (UNKNOWN_LOCATION);
 x = gimple_build_label (c->label);
 gimple_seq_add_stmt (&new_seq, x);
 	break;
 }
 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
 GIMPLE_EH_FILTER to a sequence of labels and blocks, plus the exception
 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));
 if (flag_exceptions)
 this_region = gen_eh_region_allowed (state->cur_region,
 				           gimple_eh_filter_types (inner));
 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);
 new_seq = NULL;
 this_region->u.allowed.label = create_artificial_label (UNKNOWN_LOCATION);
 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);
 return frob_into_branch_around (tp, this_region, NULL);
 /* A subroutine of lower_eh_constructs_1.  Lower a GIMPLE_TRY with
 an GIMPLE_EH_MUST_NOT_THROW to a sequence of labels and blocks,
 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);
+	= gimple_eh_must_not_throw_fndecl (
-this_region->u.must_not_throw.failure_loc = gimple_location (tp);
+	    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
 	 needs to happen.  */
 TREE_USED (this_region->u.must_not_throw.failure_decl) = 1;
 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);
 }
 /* Implement a cleanup expression.  This is similar to try-finally,
 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;
 struct leh_tf_state fake_tf;
 gimple_seq result;
 {
 this_region = gen_eh_region_cleanup (state->cur_region);
 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);
 /* Build enough of a try-finally state so that we can reuse
 if (fake_tf.may_throw)
 {
 /* 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);
 }
 else
 {
 	 the work.  All we have left is to append the fallthru_label.  */
 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);
 	}
 }
 return result;
 }
 static void
 lower_eh_constructs_2 (struct leh_state *state, gimple_stmt_iterator *gsi)
 {
 gimple_seq replace;
-gimple x;
+gimple *x;
-gimple stmt = gsi_stmt (*gsi);
+gimple *stmt = gsi_stmt (*gsi);
 switch (gimple_code (stmt))
 {
 case GIMPLE_CALL:
 {
 	      /* The front end may have generated a call to
 		 __builtin_eh_pointer (0) within a catch region.  Replace
 		 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
 		{
 		  /* The user has dome something silly.  Remove it.  */
 case GIMPLE_ASSIGN:
 /* 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)
 	  && gimple_stmt_may_fallthru (stmt)
 	  && !tree_could_throw_p (gimple_get_lhs (stmt))
 	  && is_gimple_reg_type (TREE_TYPE (gimple_get_lhs (stmt))))
 	{
 	  tree lhs = gimple_get_lhs (stmt);
-	  tree tmp = create_tmp_var (TREE_TYPE (lhs), NULL);
+	  tree tmp = create_tmp_var (TREE_TYPE (lhs));
-	  gimple s = gimple_build_assign (lhs, tmp);
+	  gimple *s = gimple_build_assign (lhs, tmp);
 	  gimple_set_location (s, gimple_location (stmt));
 	  gimple_set_block (s, gimple_block (stmt));
 	  gimple_set_lhs (stmt, tmp);
 	  if (TREE_CODE (TREE_TYPE (tmp)) == COMPLEX_TYPE
 	      || TREE_CODE (TREE_TYPE (tmp)) == VECTOR_TYPE)
 case GIMPLE_RETURN:
 maybe_record_in_goto_queue (state, stmt);
 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);
+	gtry *try_stmt = as_a <gtry *> (stmt);
-else
+	if (gimple_try_kind (try_stmt) == GIMPLE_TRY_FINALLY)
-	{
+	  replace = lower_try_finally (state, try_stmt);
-	  x = gimple_seq_first_stmt (gimple_try_cleanup (stmt));
+	else
-	  if (!x)
+	  {
-	    {
+	    x = gimple_seq_first_stmt (gimple_try_cleanup (try_stmt));
-	      replace = gimple_try_eval (stmt);
+	    if (!x)
-	      lower_eh_constructs_1 (state, replace);
-	    }
-	  else
-	    switch (gimple_code (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);
+		  replace = lower_catch (state, try_stmt);
-		    break;
+		  break;
 		case GIMPLE_EH_FILTER:
-		    replace = lower_eh_filter (state, stmt);
+		  replace = lower_eh_filter (state, try_stmt);
-		    break;
+		  break;
 		case GIMPLE_EH_MUST_NOT_THROW:
-		    replace = lower_eh_must_not_throw (state, stmt);
+		  replace = lower_eh_must_not_throw (state, try_stmt);
-		    break;
+		  break;
+		case GIMPLE_EH_ELSE:
+		  /* This code is only valid with GIMPLE_TRY_FINALLY.  */
+		  gcc_unreachable ();
 		default:
-		    replace = lower_cleanup (state, stmt);
+		  replace = lower_cleanup (state, try_stmt);
-		    break;
+		  break;
-	      }
+		}
-	}
+	  }
+}
 /* Remove the old stmt and insert the transformed sequence
 	 instead. */
 gsi_insert_seq_before (gsi, replace, GSI_SAME_STMT);
 gsi_remove (gsi, true);
 /* Return since we don't want gsi_next () */
 return;
+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.  */
 break;
 }
 }
 /* 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
+namespace {
-lower_eh_constructs (void)
+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;
 bodyp = gimple_body (current_function_decl);
 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
 change anything.  */
 gcc_assert (!gimple_seq_may_fallthru (bodyp));
 /* We assume that since BODYP already existed, adding EH_SEQ to it
 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 ();
 return 0;
 }
-struct gimple_opt_pass pass_lower_eh =
+} // anon namespace
-{
-{
+gimple_opt_pass *
-GIMPLE_PASS,
+make_pass_lower_eh (gcc::context *ctxt)
-"eh",					/* name */
+{
-NULL,					/* gate */
+return new pass_lower_eh (ctxt);
-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 */
-}
-};
 /* 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;
 basic_block src, dst;
 /* Create the single EH edge from STMT to its nearest landing pad,
 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;
 int lp_nr;
 static void
 redirect_eh_edge_1 (edge edge_in, basic_block new_bb, bool change_region)
 {
 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;
 edge e;
 /* This is a subroutine of gimple_redirect_edge_and_branch.  Update the
 labels for redirecting a non-fallthru EH_DISPATCH edge E to NEW_BB.
 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;
 basic_block old_bb;
 eh_region r;
 case UNGT_EXPR:
 case UNGE_EXPR:
 case UNEQ_EXPR:
 return honor_snans;
-case CONVERT_EXPR:
-case FIX_TRUNC_EXPR:
-/* Conversion of floating point might trap.  */
-return honor_nans;
 case NEGATE_EXPR:
 case ABS_EXPR:
 case CONJ_EXPR:
 /* These operations don't trap with floating point.  */
 if (honor_trapv)
 bool honor_snans = fp_operation && flag_signaling_nans != 0;
 bool handled;
 if (TREE_CODE_CLASS (op) != tcc_comparison
 && TREE_CODE_CLASS (op) != tcc_unary
-&& TREE_CODE_CLASS (op) != tcc_binary)
+&& TREE_CODE_CLASS (op) != tcc_binary
+&& op != FMA_EXPR)
 return false;
 return operation_could_trap_helper_p (op, fp_operation, honor_trapv,
 					honor_nans, honor_snans, divisor,
 					&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.  */
 return true;
 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:
 case BIT_FIELD_REF:
 case VIEW_CONVERT_EXPR:
 	return true;
 if (TREE_THIS_NOTRAP (expr))
 	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);
 case ASM_EXPR:
 return TREE_THIS_VOLATILE (expr);
 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:
 return false;
 }
 /* Helper for stmt_could_throw_p.  Return true if STMT (assumed to be a
 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;
 bool honor_trapv = false;
 tree t;
 size_t i;
 bool handled, ret;
 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)
 	{
 	  honor_nans = flag_trapping_math && !flag_finite_math_only;
 	  honor_snans = flag_signaling_nans != 0;
 	}
 else if (INTEGRAL_TYPE_P (t) && TYPE_OVERFLOW_TRAPS (t))
 	honor_trapv = true;
 }
+/* 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;
 return false;
 }
 /* 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;
 /* The only statements that can throw an exception are assignments,
 {
 case GIMPLE_RESX:
 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;
 }
 }
 /* Return true if STMT can throw an exception that is not caught within
 the current function (CFUN).  */
 bool
-stmt_can_throw_external (gimple stmt)
+stmt_can_throw_external (gimple *stmt)
 {
 int lp_nr;
 if (!stmt_could_throw_p (stmt))
 return false;
 /* Return true if STMT can throw an exception that is caught within
 the current function (CFUN).  */
 bool
-stmt_can_throw_internal (gimple stmt)
+stmt_can_throw_internal (gimple *stmt)
 {
 int lp_nr;
 if (!stmt_could_throw_p (stmt))
 return false;
 /* Given a statement STMT in IFUN, if STMT can no longer throw, then
 remove any entry it might have from the EH table.  Return true if
 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;
 return remove_stmt_from_eh_lp_fn (ifun, stmt);
 }
 /* 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);
 }
 /* Given a statement OLD_STMT and a new statement NEW_STMT that has replaced
 OLD_STMT in the function, remove OLD_STMT from the EH table and put NEW_STMT
 in the table if it should be in there.  Return TRUE if a replacement was
 done that my require an EH edge purge.  */
 bool
-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);
 if (lp_nr != 0)
 {
 }
 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,
+maybe_duplicate_eh_stmt_fn (struct function *new_fun, gimple *new_stmt,
-			    struct function *old_fun, gimple old_stmt,
+			    struct function *old_fun, gimple *old_stmt,
-			    struct pointer_map_t *map, int default_lp_nr)
+			    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;
 old_lp_nr = lookup_stmt_eh_lp_fn (old_fun, old_stmt);
 }
 else if (old_lp_nr > 0)
 {
 eh_landing_pad old_lp, new_lp;
-old_lp = VEC_index (eh_landing_pad, old_fun->eh->lp_array, old_lp_nr);
+old_lp = (*old_fun->eh->lp_array)[old_lp_nr];
-slot = pointer_map_contains (map, old_lp);
+new_lp = static_cast<eh_landing_pad> (*map->get (old_lp));
-new_lp = (eh_landing_pad) *slot;
 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);
+old_r = (*old_fun->eh->region_array)[-old_lp_nr];
-slot = pointer_map_contains (map, old_r);
+new_r = static_cast<eh_region> (*map->get (old_r));
-new_r = (eh_region) *slot;
 new_lp_nr = -new_r->index;
 }
 add_stmt_to_eh_lp_fn (new_fun, new_stmt, new_lp_nr);
 return true;
 /* Similar, but both OLD_STMT and NEW_STMT are within the current function,
 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;
 if (!stmt_could_throw_p (new_stmt))
 return false;
 static bool
 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);
 if (!gsi_one_before_end_p (gsi))
 return false;
 || !is_gimple_call (twos)
 || gimple_call_lhs (ones)
 || gimple_call_lhs (twos)
 || gimple_call_chain (ones)
 || gimple_call_chain (twos)
-|| !operand_equal_p (gimple_call_fn (ones), gimple_call_fn (twos), 0)
+|| !gimple_call_same_target_p (ones, twos)
 || gimple_call_num_args (ones) != gimple_call_num_args (twos))
 return false;
 for (ai = 0; ai < gimple_call_num_args (ones); ++ai)
 if (!operand_equal_p (gimple_call_arg (ones, ai),
 This occurs frequently in C++, where A is a local variable and B is a
 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;
+gimple_seq cleanup;
-gsi = gsi_start (gimple_try_cleanup (one));
+cleanup = gimple_try_cleanup (one);
+gsi = gsi_start (cleanup);
 if (!gsi_one_before_end_p (gsi))
 return;
 oneh = gsi_stmt (gsi);
 if (gimple_code (oneh) != GIMPLE_TRY
 static void
 refactor_eh_r (gimple_seq seq)
 {
 gimple_stmt_iterator gsi;
-gimple one, two;
+gimple *one, *two;
 one = NULL;
 two = NULL;
 gsi = gsi_start (seq);
 while (1)
 one = two;
 if (gsi_end_p (gsi))
 	two = NULL;
 else
 	two = gsi_stmt (gsi);
-if (one
+if (one && two)
-	  && two
+	if (gtry *try_one = dyn_cast <gtry *> (one))
-	  && gimple_code (one) == GIMPLE_TRY
+	  if (gtry *try_two = dyn_cast <gtry *> (two))
-	  && gimple_code (two) == GIMPLE_TRY
+	    if (gimple_try_kind (try_one) == GIMPLE_TRY_FINALLY
-	  && gimple_try_kind (one) == GIMPLE_TRY_FINALLY
+		&& gimple_try_kind (try_two) == GIMPLE_TRY_FINALLY)
-	  && gimple_try_kind (two) == GIMPLE_TRY_FINALLY)
+	      optimize_double_finally (try_one, try_two);
-	optimize_double_finally (one, two);
 if (one)
 	switch (gimple_code (one))
 	  {
 	  case GIMPLE_TRY:
 	    refactor_eh_r (gimple_try_eval (one));
 	    refactor_eh_r (gimple_try_cleanup (one));
 	    break;
 	  case GIMPLE_CATCH:
-	    refactor_eh_r (gimple_catch_handler (one));
+	    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;
 	  }
 if (two)
 else
 	break;
 }
 }
-static unsigned
+namespace {
-refactor_eh (void)
-{
+const pass_data pass_data_refactor_eh =
-refactor_eh_r (gimple_body (current_function_decl));
+{
-return 0;
+GIMPLE_PASS, /* type */
-}
+"ehopt", /* name */
+OPTGROUP_NONE, /* optinfo_flags */
-static bool
+TV_TREE_EH, /* tv_id */
-gate_refactor_eh (void)
+PROP_gimple_lcf, /* properties_required */
-{
+0, /* properties_provided */
-return flag_exceptions != 0;
+0, /* properties_destroyed */
-}
+0, /* todo_flags_start */
+0, /* todo_flags_finish */
-struct gimple_opt_pass pass_refactor_eh =
-{
-{
-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 */
-}
 };
+class pass_refactor_eh : public gimple_opt_pass
+{
+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;
 lp_nr = lookup_stmt_eh_lp (stmt);
 if (lp_nr != 0)
 	 happen without optimization when the switch statement created by
 	 lower_try_finally_switch isn't simplified to remove the eh case.
 	 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);
 while (EDGE_COUNT (bb->succs) > 0)
 	remove_edge (EDGE_SUCC (bb, 0));
 edge e;
 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);
 	      fn = dst_r->u.must_not_throw.failure_decl;
 	      x = gimple_build_call (fn, 0);
 	      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);
+	      mnt_map->put (dst_r, lab);
-	      *slot = 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 = make_single_succ_edge (bb, new_bb, EDGE_FALLTHRU);
-	  e->count = bb->count;
-	  e->probability = REG_BR_PROB_BASE;
 	}
 else
 	{
 	  edge_iterator ei;
-	  tree dst_nr = build_int_cst (NULL, dst_r->index);
+	  tree dst_nr = build_int_cst (integer_type_node, dst_r->index);
-	  fn = implicit_built_in_decls[BUILT_IN_EH_COPY_VALUES];
+	  fn = builtin_decl_implicit (BUILT_IN_EH_COPY_VALUES);
-	  src_nr = build_int_cst (NULL, src_r->index);
+	  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);
 	  /* Update the flags for the outgoing edge.  */
 	  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)
 	    if (e->flags & EDGE_EH)
 	      break;
 /* When we don't have a destination region, this exception escapes
 	 up the call chain.  We resolve this by generating a call to the
 	 _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];
+	  fn = builtin_decl_implicit (BUILT_IN_EH_POINTER);
-	  src_nr = build_int_cst (NULL, src_r->index);
+	  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);
 	}
 gcc_assert (EDGE_COUNT (bb->succs) == 0);
 gsi_remove (&gsi, true);
 return ret;
 }
-static unsigned
+namespace {
-execute_lower_resx (void)
+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 ();
+hash_map<eh_region, tree> mnt_map;
-FOR_EACH_BB (bb)
+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);
 free_dominance_info (CDI_POST_DOMINATORS);
 }
 return any_rewritten ? TODO_update_ssa_only_virtuals : 0;
 }
-static bool
+} // anon namespace
-gate_lower_resx (void)
-{
+gimple_opt_pass *
-return flag_exceptions != 0;
+make_pass_lower_resx (gcc::context *ctxt)
-}
+{
+return new pass_lower_resx (ctxt);
-struct gimple_opt_pass pass_lower_resx =
+}
-{
-{
+/* Try to optimize var = {v} {CLOBBER} stmts followed just by
-GIMPLE_PASS,
+external throw.  */
-"resx",				/* name */
-gate_lower_resx,			/* gate */
+static void
-execute_lower_resx,			/* execute */
+optimize_clobbers (basic_block bb)
-NULL,					/* sub */
+{
-NULL,					/* next */
+gimple_stmt_iterator gsi = gsi_last_bb (bb);
-0,					/* static_pass_number */
+bool any_clobbers = false;
-TV_TREE_EH,				/* tv_id */
+bool seen_stack_restore = false;
-PROP_gimple_lcf,			/* properties_required */
+edge_iterator ei;
-0,					/* properties_provided */
+edge e;
-0,					/* properties_destroyed */
-0,					/* todo_flags_start */
+/* Only optimize anything if the bb contains at least one clobber,
-TODO_dump_func | TODO_verify_flow	/* todo_flags_finish */
+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);
+}
+}
+/* Try to sink var = {v} {CLOBBER} stmts followed just by
+internal throw to successor BB.  */
+static int
+sink_clobbers (basic_block bb)
+{
+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);
 r = get_eh_region_from_number (region_nr);
 switch (r->type)
 {
 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)
 	  {
 	    tree tp_node, flt_node, lab = c->label;
 	    bool have_label = false;
 		/* Filter out duplicate labels that arise when this handler
 		   is shadowed by an earlier one.  When no labels are
 		   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 t = build_case_label (TREE_VALUE (flt_node),
-				     TREE_VALUE (flt_node), NULL, lab);
+					       NULL, lab);
-		    VEC_safe_push (tree, heap, labels, t);
+		    labels.safe_push (t);
-		    pointer_set_insert (seen_values, TREE_VALUE (flt_node));
+		    seen_values.add (TREE_VALUE (flt_node));
 		    have_label = true;
 		  }
 		tp_node = TREE_CHAIN (tp_node);
 		flt_node = TREE_CHAIN (flt_node);
 	  }
 	gcc_assert (default_label != NULL);
 	/* 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];
+	    fn = builtin_decl_implicit (BUILT_IN_EH_FILTER);
-	    x = gimple_build_call (fn, 1, build_int_cst (NULL, region_nr));
+	    x = gimple_build_call (fn, 1, build_int_cst (integer_type_node,
-	    filter = create_tmp_var (TREE_TYPE (TREE_TYPE (fn)), NULL);
+							 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,
+	    default_label = build_case_label (NULL, NULL, default_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;
 case ERT_ALLOWED_EXCEPTIONS:
 {
 	edge b_e = BRANCH_EDGE (src);
 	edge f_e = FALLTHRU_EDGE (src);
-	fn = implicit_built_in_decls[BUILT_IN_EH_FILTER];
+	fn = builtin_decl_implicit (BUILT_IN_EH_FILTER);
-	x = gimple_build_call (fn, 1, build_int_cst (NULL, region_nr));
+	x = gimple_build_call (fn, 1, build_int_cst (integer_type_node,
-	filter = create_tmp_var (TREE_TYPE (TREE_TYPE (fn)), NULL);
+						     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);
 	r->u.allowed.label = NULL;
 /* Replace the EH_DISPATCH with the SWITCH or COND generated above.  */
 gsi_remove (&gsi, true);
 return redirected;
 }
-static unsigned
+namespace {
-execute_lower_eh_dispatch (void)
+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);
+gimple *last = last_stmt (bb);
-if (last && gimple_code (last) == GIMPLE_EH_DISPATCH)
+if (last == NULL)
-	{
+	continue;
-	  redirected |= lower_eh_dispatch (bb, last);
+if (gimple_code (last) == GIMPLE_EH_DISPATCH)
-	  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;
 }
-static bool
+} // anon namespace
-gate_lower_eh_dispatch (void)
-{
+gimple_opt_pass *
-return cfun->eh->region_tree != NULL;
+make_pass_lower_eh_dispatch (gcc::context *ctxt)
-}
+{
+return new pass_lower_eh_dispatch (ctxt);
-struct gimple_opt_pass pass_lower_eh_dispatch =
+}
-{
-{
-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
+/* Walk statements, see what regions and, optionally, landing pads
-those that are unused.  */
+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)
+{
+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)
 {
 sbitmap r_reachable, lp_reachable;
 eh_region region;
 eh_landing_pad lp;
-basic_block bb;
+unsigned i;
-int lp_nr, r_nr;
+mark_reachable_handlers (&r_reachable, &lp_reachable);
-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);
-	    }
-	}
-}
 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;
+if (dump_file)
-VEC_iterate (eh_region, cfun->eh->region_array, r_nr, region); ++r_nr)
+{
-if (region && !TEST_BIT (r_reachable, r_nr))
+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);
+	  fprintf (dump_file,
-	remove_eh_handler (region);
+		   "Removing unreachable landing pad %d\n",
-}
+		   lp->index);
-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);
 	remove_eh_landing_pad (lp);
 }
 if (dump_file)
 {
 }
 sbitmap_free (r_reachable);
 sbitmap_free (lp_reachable);
-#ifdef ENABLE_CHECKING
+if (flag_checking)
 verify_eh_tree (cfun);
-#endif
+}
+/* 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;
+eh_region region;
-int i;
+sbitmap r_reachable;
+unsigned 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)
+mark_reachable_handlers (&r_reachable, /*lp_reachablep=*/NULL);
-{
-	if (dump_file)
+FOR_EACH_VEC_SAFE_ELT (cfun->eh->region_array, i, region)
-	  fprintf (dump_file, "Removing unreachable region %d\n", i);
+{
-	remove_eh_handler (r);
+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
 optimisticaly split all sorts of edges, including EH edges.  The
 optimization passes in between may not have needed them; if not,
 basic_block bb = label_to_block (lp->post_landing_pad);
 gimple_stmt_iterator gsi;
 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_in = single_pred_edge (bb);
-e_out = EDGE_SUCC (bb, 0);
+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)
 return false;
 /* The destination block must not already have a landing pad
 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;
 }
 /* ??? We can get degenerate phis due to cfg cleanups.  I would have
 thought this should have been cleaned up by a phicprop pass, but
 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;
 	  imm_use_iterator iter;
 	    }
 	  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);
 	}
 }
 if (dump_file && (dump_flags & TDF_DETAILS))
 fprintf (dump_file, "Unsplit EH landing pad %d to block %i.\n",
 to the PHI nodes in E_OUT->DEST.  */
 redirect_eh_edge_1 (e_in, e_out->dest, false);
 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;
 }
 {
 bool changed = false;
 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);
 return changed;
 }
 static bool
 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);
 nop = gimple_phi_arg_def (nphi, old_bb_out->dest_idx);
 /* Find the corresponding PHI in OLD_BB so we can forward-propagate
 	 the source ssa_name.  */
 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;
 	}
 	      oop = gimple_phi_arg_def (ophi, e->dest_idx);
 	      oloc = gimple_phi_arg_location (ophi, e->dest_idx);
 	      redirect_edge_var_map_add (e, nresult, oop, oloc);
 	    }
 	}
-/* If we didn't find the PHI, but it's a VOP, remember to rename
+/* If we didn't find the PHI, if it's a real variable or a VOP, we know
-	 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
 	 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.  */
 else
 	{
 /* Second, verify that all PHIs from OLD_BB have been handled.  If not,
 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);
 }
 else
 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;
 }
 /* A subroutine of cleanup_empty_eh.  Move a landing pad LP from its
 old region to NEW_REGION at BB.  */
 lp->next_lp = new_region->landing_pads;
 new_region->landing_pads = lp;
 /* 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
 unsplitting than unsplit_eh was prepared to handle, e.g. when
 multiple incoming edges and phis are involved.  */
 static bool
 cleanup_empty_eh_unsplit (basic_block bb, edge e_out, eh_landing_pad lp)
 {
 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
 be a successor.  */
 gcc_assert (e_out != NULL);
 /* The destination block must not already have a landing pad
 for a different region.  */
 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);
 if (lp_nr && get_eh_region_from_lp_number (lp_nr) != lp->region)
 	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))
 {
 if (dump_file && (dump_flags & TDF_DETAILS))
 static bool
 cleanup_empty_eh (eh_landing_pad lp)
 {
 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.  */
 switch (EDGE_COUNT (bb->succs))
 {
 case 0:
 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.  */
 if (!gsi_end_p (gsi) && is_gimple_debug (gsi_stmt (gsi)))
 gsi_next_nondebug (&gsi);
 /* 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.  */
+/* For the degenerate case of an infinite loop bail out.
-if (infinite_empty_loop_p (e_out))
+	 If bb has no successors and is totally empty, which can happen e.g.
-	return false;
+	 because of incorrect noreturn attribute, bail out too.  */
+if (e_out == NULL
-return cleanup_empty_eh_unsplit (bb, e_out, lp);
+	  || infinite_empty_loop_p (e_out))
-}
+	return ret;
-/* The block should consist only of a single RESX statement.  */
+return ret | cleanup_empty_eh_unsplit (bb, e_out, lp);
+}
+/* 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;
+return ret;
-gcc_assert (gsi_one_before_end_p (gsi));
+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;
 FOR_EACH_EDGE (e, ei, bb->preds)
 if (!(e->flags & EDGE_EH))
 {
 gcc_assert (e_out == NULL);
 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);
 	  }
 	else
 	  ei_next (&ei);
 if (new_region->type == ERT_MUST_NOT_THROW)
 {
 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);
 	  }
 	else
 /* ??? The CFG didn't change, but we may have rendered the
 	 old EH region unreachable.  Trigger a cleanup there.  */
 return true;
 }
-return false;
+return ret;
 succeed:
 if (dump_file && (dump_flags & TDF_DETAILS))
 fprintf (dump_file, "Empty EH handler %i removed.\n", lp->index);
 remove_eh_landing_pad (lp);
 {
 bool changed = false;
 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);
 return changed;
 }
 /* Perform cleanups and lowering of exception handling
 1) cleanups regions with handlers doing nothing are optimized out
 2) MUST_NOT_THROW regions that became dead because of 1) are optimized out
 3) Info about regions that are containing instructions, and regions
 reachable via local EH edges is collected
-4) Eh tree is pruned for regions no longer neccesary.
+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.
 */
 /* Do this first: unsplit_all_eh and cleanup_all_empty_eh can die
 looking up unreachable landing pads.  */
 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)
 	{
 	  free_dominance_info (CDI_DOMINATORS);
 }
 return 0;
 }
-static unsigned int
+namespace {
-execute_cleanup_eh (void)
+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 ();
 /* If the function no longer needs an EH personality routine
 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
+} // anon namespace
-gate_cleanup_eh (void)
-{
+gimple_opt_pass *
-return cfun->eh != NULL && cfun->eh->region_tree != NULL;
+make_pass_cleanup_eh (gcc::context *ctxt)
-}
+{
+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;
 int lp_nr;
 edge_iterator ei;
 }
 /* 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;
 basic_block src, dst;
 bool want_fallthru = true;

Mercurial > hg > CbC > CbC_gcc

comparison gcc/tree-eh.c @ 111:04ced10e8804