diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-09-12 19:55:36 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-09-12 19:55:36 +0200 |
| commit | b58d339116b877e735e57979143f4531d6a110d9 (patch) | |
| tree | 84e348fd43f73f9669e6bc1af8e4795e47ee65f3 | |
| parent | 7d8102762c1b37bd1b0b59795a67ffc0da6631a5 (diff) | |
| download | gcc-b58d339116b877e735e57979143f4531d6a110d9.zip gcc-b58d339116b877e735e57979143f4531d6a110d9.tar.gz gcc-b58d339116b877e735e57979143f4531d6a110d9.tar.bz2 | |
re PR rtl-optimization/50212 (ICE: in ei_container, at basic-block.h:610 with -fnon-call-exceptions -freorder-blocks-and-partition)
PR rtl-optimization/50212
* bb-reorder.c (find_rarely_executed_basic_blocks_and_crossing_edges):
Skip also lps with NULL landing_pad or non-LABEL_P landing_pad.
* g++.dg/other/pr50212.C: New test.
From-SVN: r178785
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/bb-reorder.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/pr50212.C | 17 |
4 files changed, 30 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8bc80a..311cb8d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2011-09-12 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/50212 + * bb-reorder.c (find_rarely_executed_basic_blocks_and_crossing_edges): + Skip also lps with NULL landing_pad or non-LABEL_P landing_pad. + PR debug/50299 * calls.c (load_register_parameters): Use use_reg_mode instead of use_reg when adding a single register CALL_INSN_FUNCTION_USAGE diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c index 874ece2..3ac7fbd 100644 --- a/gcc/bb-reorder.c +++ b/gcc/bb-reorder.c @@ -1,5 +1,5 @@ /* Basic block reordering routines for the GNU compiler. - Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 + Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -1315,7 +1315,9 @@ find_rarely_executed_basic_blocks_and_crossing_edges (void) { bool all_same, all_diff; - if (lp == NULL) + if (lp == NULL + || lp->landing_pad == NULL_RTX + || !LABEL_P (lp->landing_pad)) continue; all_same = all_diff = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 57c8209..4fa122c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-09-12 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/50212 + * g++.dg/other/pr50212.C: New test. + 2011-09-12 Georg-Johann Lay <avr@gjlay.de> PR target/43746 diff --git a/gcc/testsuite/g++.dg/other/pr50212.C b/gcc/testsuite/g++.dg/other/pr50212.C new file mode 100644 index 0000000..c0b030d --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr50212.C @@ -0,0 +1,17 @@ +// PR rtl-optimization/50212 +// { dg-do compile } +// { dg-require-effective-target freorder } +// { dg-options "-O -fnon-call-exceptions -ftrapv -freorder-blocks-and-partition" } + +void +foo (int n) +{ + try + { + int i = 0; + while (i++ < n); + } + catch (...) + { + } +} |