aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-eh.c
diff options
context:
space:
mode:
authorMichael Matz <matz@gcc.gnu.org>2012-01-26 13:24:58 +0000
committerMichael Matz <matz@gcc.gnu.org>2012-01-26 13:24:58 +0000
commit1a47f99c0f033b16594eaabac4e6dbc4c5c58554 (patch)
tree0e78fd6f3d83e39d28a6a95ef13ede7c57ee9c92 /gcc/tree-eh.c
parentc0a9d2a12ec96a90e41998f34d036c4281d91797 (diff)
downloadgcc-1a47f99c0f033b16594eaabac4e6dbc4c5c58554.zip
gcc-1a47f99c0f033b16594eaabac4e6dbc4c5c58554.tar.gz
gcc-1a47f99c0f033b16594eaabac4e6dbc4c5c58554.tar.bz2
re PR tree-optimization/48794 (ICE: SIGSEGV in remap_eh_region_nr (tree-inline.c:1194) with -Os -fopenmp -fexceptions -fno-tree-ccp -fno-tree-copy-prop)
PR tree-optimization/48794 * tree-eh.c (remove_unreachable_handlers_no_lp): Don't remove regions referenced from RESX/EH_DISPATCH. testsuite/ * gfortran.dg/gomp/pr48794-2.f90: New testcase. From-SVN: r183559
Diffstat (limited to 'gcc/tree-eh.c')
-rw-r--r--gcc/tree-eh.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index cad37e6..2064d51 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -3617,14 +3617,40 @@ remove_unreachable_handlers_no_lp (void)
{
eh_region r;
int i;
+ sbitmap r_reachable;
+ basic_block bb;
+
+ r_reachable = sbitmap_alloc (VEC_length (eh_region, cfun->eh->region_array));
+ sbitmap_zero (r_reachable);
+
+ FOR_EACH_BB (bb)
+ {
+ gimple stmt = last_stmt (bb);
+ if (stmt)
+ /* Avoid removing regions referenced from RESX/EH_DISPATCH. */
+ switch (gimple_code (stmt))
+ {
+ case GIMPLE_RESX:
+ SET_BIT (r_reachable, gimple_resx_region (stmt));
+ break;
+ case GIMPLE_EH_DISPATCH:
+ SET_BIT (r_reachable, gimple_eh_dispatch_region (stmt));
+ break;
+ default:
+ break;
+ }
+ }
for (i = 1; VEC_iterate (eh_region, cfun->eh->region_array, i, r); ++i)
- if (r && r->landing_pads == NULL && r->type != ERT_MUST_NOT_THROW)
+ if (r && r->landing_pads == NULL && r->type != ERT_MUST_NOT_THROW
+ && !TEST_BIT (r_reachable, i))
{
if (dump_file)
fprintf (dump_file, "Removing unreachable region %d\n", i);
remove_eh_handler (r);
}
+
+ sbitmap_free (r_reachable);
}
/* Undo critical edge splitting on an EH landing pad. Earlier, we