diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-12-12 22:00:36 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-12-12 22:00:36 +0100 |
| commit | 6e456f4cf4deee3e2ccd9849286f59b90644c48b (patch) | |
| tree | 7ed652648dc198102247414a0ec9f76f20b4e4d9 | |
| parent | c88388e6745fb65bbc41c1e941c41f02ff27e4b7 (diff) | |
| download | gcc-6e456f4cf4deee3e2ccd9849286f59b90644c48b.zip gcc-6e456f4cf4deee3e2ccd9849286f59b90644c48b.tar.gz gcc-6e456f4cf4deee3e2ccd9849286f59b90644c48b.tar.bz2 | |
re PR rtl-optimization/51495 (ICE: in force_nonfallthru_and_redirect, at cfgrtl.c:1171 with computed goto)
PR rtl-optimization/51495
* function.c (thread_prologue_and_epilogue_insns): Don't add
to bb_tail basic blocks that have EDGE_COMPLEX predecessor edges
from basic blocks not needing prologue.
* gcc.c-torture/compile/pr51495.c: New test.
From-SVN: r182265
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/function.c | 19 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr51495.c | 14 |
4 files changed, 38 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 68d354d..6a7fedd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2011-12-12 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/51495 + * function.c (thread_prologue_and_epilogue_insns): Don't add + to bb_tail basic blocks that have EDGE_COMPLEX predecessor edges + from basic blocks not needing prologue. + PR tree-optimization/51481 * gimple-fold.c (gimple_fold_call): Call maybe_clean_or_replace_eh_stmt. Avoid optimization if stmt has EH diff --git a/gcc/function.c b/gcc/function.c index a081b27..506ec03 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -5956,9 +5956,22 @@ thread_prologue_and_epilogue_insns (void) FOR_EACH_EDGE (e, ei, tmp_bb->preds) if (single_succ_p (e->src) && !bitmap_bit_p (&bb_on_list, e->src->index) - && can_duplicate_block_p (e->src) - && bitmap_set_bit (&bb_tail, e->src->index)) - VEC_quick_push (basic_block, vec, e->src); + && can_duplicate_block_p (e->src)) + { + edge pe; + edge_iterator pei; + + /* If there is predecessor of e->src which doesn't + need prologue and the edge is complex, + we might not be able to redirect the branch + to a copy of e->src. */ + FOR_EACH_EDGE (pe, pei, e->src->preds) + if ((pe->flags & EDGE_COMPLEX) != 0 + && !bitmap_bit_p (&bb_flags, pe->src->index)) + break; + if (pe == NULL && bitmap_set_bit (&bb_tail, e->src->index)) + VEC_quick_push (basic_block, vec, e->src); + } } /* Now walk backwards from every block that is marked as needing diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5f0f195..acf3efc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-12-12 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/51495 + * gcc.c-torture/compile/pr51495.c: New test. + PR tree-optimization/51481 * gcc.dg/pr51481.c: New test. diff --git a/gcc/testsuite/gcc.c-torture/compile/pr51495.c b/gcc/testsuite/gcc.c-torture/compile/pr51495.c new file mode 100644 index 0000000..34de37b --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr51495.c @@ -0,0 +1,14 @@ +/* PR rtl-optimization/51495 */ + +void bar (void); + +int +foo (int i) +{ + static const void *const table[] = { &&begin, &&end }; + goto *(table[i]); +begin: + bar (); +end: + return 0; +} |