aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree-eh.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b7e531..6dade07 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-20 Jakub Jelinek <jakub@redhat.com>
+
+ PR tree-optimization/48611
+ * tree-eh.c (note_eh_region_may_contain_throw): Don't propagate
+ beyond ERT_MUST_NOT_THROW region.
+
2011-04-20 Catherine Moore <clm@codesourcery.com>
* config/mips/mips.opt (mfix-24k): New.
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 5ef319d..76453b8 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -849,6 +849,8 @@ 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;