+2004-11-18 Andrew Pinski <pinskia@physics.uc.edu>
+
+ * ifcvt.c (find_if_block): Move the check for the number of edges
+ above the loops checking for complex edges.
+ Remove the counting of edges as we use EDGE_COUNT now.
+
2004-11-18 Kazuhiro Inaoka <inaoka.kazuhiro@renesas.comn>
* config/m32r/linux.h (TARGET_ASM_FILE_END): Set
basic_block then_bb = ce_info->then_bb;
basic_block else_bb = ce_info->else_bb;
basic_block join_bb = NULL_BLOCK;
- int then_predecessors;
- int else_predecessors;
edge cur_edge;
basic_block next;
edge_iterator ei;
}
}
- /* Count the number of edges the THEN and ELSE blocks have. */
- then_predecessors = 0;
+ /* The THEN block of an IF-THEN combo must have exactly one predecessor,
+ other than any || blocks which jump to the THEN block. */
+ if ((EDGE_COUNT (then_bb->preds) - ce_info->num_or_or_blocks) != 1)
+ return FALSE;
+
+ /* The edges of the THEN and ELSE blocks cannot have complex edges. */
FOR_EACH_EDGE (cur_edge, ei, then_bb->preds)
{
- then_predecessors++;
if (cur_edge->flags & EDGE_COMPLEX)
return FALSE;
}
- else_predecessors = 0;
FOR_EACH_EDGE (cur_edge, ei, else_bb->preds)
{
- else_predecessors++;
if (cur_edge->flags & EDGE_COMPLEX)
return FALSE;
}
- /* The THEN block of an IF-THEN combo must have exactly one predecessor,
- other than any || blocks which jump to the THEN block. */
- if ((then_predecessors - ce_info->num_or_or_blocks) != 1)
- return FALSE;
-
/* The THEN block of an IF-THEN combo must have zero or one successors. */
if (EDGE_COUNT (then_bb->succs) > 0
&& (EDGE_COUNT (then_bb->succs) > 1