From bd2eae1880e3fefa91e26dcc32cf0ac8f45f3aff Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 23 Mar 2003 12:14:57 -0800 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/ifcvt.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fb144abb9b4e..65799f533271 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-03-23 Richard Henderson + + 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 * configure.in: Check whether it is necessary to link against diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 0cfd06f30296..9236b6a08bbe 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. */