diff options
| author | Jan Hubicka <jh@suse.cz> | 2009-04-25 11:02:05 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2009-04-25 09:02:05 +0000 |
| commit | 496a4ef59d7830dbedecb7718cb2b4c0a7377528 (patch) | |
| tree | d9aa3a1c938bc4df3cbd34eb918dde4d83d84237 /gcc/tree-inline.c | |
| parent | bc2a4733e2715627ca95a1bccda96a9c2be30ea5 (diff) | |
| download | gcc-496a4ef59d7830dbedecb7718cb2b4c0a7377528.zip gcc-496a4ef59d7830dbedecb7718cb2b4c0a7377528.tar.gz gcc-496a4ef59d7830dbedecb7718cb2b4c0a7377528.tar.bz2 | |
tree-eh.c (tree_remove_unreachable_handlers): Handle shared labels.
* tree-eh.c (tree_remove_unreachable_handlers): Handle shared labels.
(tree_empty_eh_handler_p): Allow non-EH predecestors; allow region
to be reached by different label than left.
(update_eh_edges): Update comment; remove edge_to_remove if possible
and return true if suceeded.
(cleanup_empty_eh): Accept sharing map; handle shared regions.
(cleanup_eh): Compute sharing map.
* except.c (remove_eh_handler_and_replace): Add argument if we should
update regions.
(remove_unreachable_regions): Update for label sharing.
(label_to_region_map): Likewise.
(get_next_region_sharing_label): New function.
(remove_eh_handler_and_replace): Add update_catch_try parameter; update
prev_try pointers.
(remove_eh_handler): Update.
(remove_eh_region_and_replace_by_outer_of): New function.
* except.h (struct eh_region): Add next_region_sharing_label.
(remove_eh_region_and_replace_by_outer_of,
get_next_region_sharing_label): Declare.
* tree-cfgcleanup.c (tree_forwarder_block_p): Simplify.
* tree-cfg.c (split_critical_edges): Split also edges where we can't
insert code even if they are not critical.
* tree-cfg.c (gimple_can_merge_blocks_p): EH edges are unmergable.
(gimple_can_remove_branch_p): EH edges won't remove branch by
redirection.
* tree-inline.c (update_ssa_across_abnormal_edges): Do handle
updating of non-abnormal EH edges.
* tree-cfg.c (gimple_can_merge_blocks_p): EH edges are unmergable.
(gimple_can_remove_branch_p): EH edges are unremovable by redirection.
(split_critical_edges): Split also edges where emitting code on them
will lead to splitting later.
From-SVN: r146763
Diffstat (limited to 'gcc/tree-inline.c')
| -rw-r--r-- | gcc/tree-inline.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 686611d..9344880 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1608,8 +1608,6 @@ update_ssa_across_abnormal_edges (basic_block bb, basic_block ret_bb, gimple phi; gimple_stmt_iterator si; - gcc_assert (e->flags & EDGE_ABNORMAL); - if (!nonlocal_goto) gcc_assert (e->flags & EDGE_EH); @@ -1625,7 +1623,8 @@ update_ssa_across_abnormal_edges (basic_block bb, basic_block ret_bb, /* There shouldn't be any PHI nodes in the ENTRY_BLOCK. */ gcc_assert (!e->dest->aux); - gcc_assert (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (PHI_RESULT (phi))); + gcc_assert ((e->flags & EDGE_EH) + || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (PHI_RESULT (phi))); if (!is_gimple_reg (PHI_RESULT (phi))) { |