diff options
| author | Richard Henderson <rth@redhat.com> | 2003-03-23 12:14:57 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2003-03-23 12:14:57 -0800 |
| commit | bd2eae1880e3fefa91e26dcc32cf0ac8f45f3aff (patch) | |
| tree | 0fbcc7e5665d66dbc78e99e8a3cd9dce2790c130 /gcc | |
| parent | 62c9aa5f9ead6be1b49757ce1c638f7caf49b494 (diff) | |
| download | gcc-bd2eae1880e3fefa91e26dcc32cf0ac8f45f3aff.zip gcc-bd2eae1880e3fefa91e26dcc32cf0ac8f45f3aff.tar.gz gcc-bd2eae1880e3fefa91e26dcc32cf0ac8f45f3aff.tar.bz2 | |
re PR rtl-optimization/10116 (ce2: invalid merge of "join_bb" in the context of switch statements)
PR opt/10116
* ifcvt.c (find_if_block): Disallow tablejump insns outgoing
from then_bb or else_bb after flow2.
From-SVN: r64750
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ifcvt.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fb144ab..65799f5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-03-23 Richard Henderson <rth@redhat.com> + + PR opt/10116 + * ifcvt.c (find_if_block): Disallow tablejump insns outgoing + from then_bb or else_bb after flow2. + 2003-03-23 Zack Weinberg <zack@codesourcery.com> * configure.in: Check whether it is necessary to link against diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 0cfd06f..9236b6a 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -2365,7 +2365,8 @@ find_if_block (ce_info) /* The THEN block of an IF-THEN combo must have zero or one successors. */ if (then_succ != NULL_EDGE && (then_succ->succ_next != NULL_EDGE - || (then_succ->flags & EDGE_COMPLEX))) + || (then_succ->flags & EDGE_COMPLEX) + || (flow2_completed && tablejump_p (then_bb->end, NULL, NULL)))) return FALSE; /* If the THEN block has no successors, conditional execution can still @@ -2412,7 +2413,8 @@ find_if_block (ce_info) && then_succ->dest == else_succ->dest && else_bb->pred->pred_next == NULL_EDGE && else_succ->succ_next == NULL_EDGE - && ! (else_succ->flags & EDGE_COMPLEX)) + && ! (else_succ->flags & EDGE_COMPLEX) + && ! (flow2_completed && tablejump_p (else_bb->end, NULL, NULL))) join_bb = else_succ->dest; /* Otherwise it is not an IF-THEN or IF-THEN-ELSE combination. */ |