diff options
Diffstat (limited to 'gcc/predict.c')
| -rw-r--r-- | gcc/predict.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/predict.c b/gcc/predict.c index 116de35..efb12f70 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -434,14 +434,14 @@ combine_predictions_for_insn (rtx insn, basic_block bb) /* Save the prediction into CFG in case we are seeing non-degenerated conditional jump. */ - if (EDGE_COUNT (bb->succs) > 1) + if (!single_succ_p (bb)) { BRANCH_EDGE (bb)->probability = combined_probability; FALLTHRU_EDGE (bb)->probability = REG_BR_PROB_BASE - combined_probability; } } - else if (EDGE_COUNT (bb->succs) > 1) + else if (!single_succ_p (bb)) { int prob = INTVAL (XEXP (prob_note, 0)); @@ -449,7 +449,7 @@ combine_predictions_for_insn (rtx insn, basic_block bb) FALLTHRU_EDGE (bb)->probability = REG_BR_PROB_BASE - prob; } else - EDGE_SUCC (bb, 0)->probability = REG_BR_PROB_BASE; + single_succ_edge (bb)->probability = REG_BR_PROB_BASE; } /* Combine predictions into single probability and store them into CFG. @@ -833,8 +833,8 @@ estimate_probability (struct loops *loops_info) care for error returns and other are often used for fast paths trought function. */ if ((e->dest == EXIT_BLOCK_PTR - || (EDGE_COUNT (e->dest->succs) == 1 - && EDGE_SUCC (e->dest, 0)->dest == EXIT_BLOCK_PTR)) + || (single_succ_p (e->dest) + && single_succ (e->dest) == EXIT_BLOCK_PTR)) && !predicted_by_p (bb, PRED_NULL_RETURN) && !predicted_by_p (bb, PRED_CONST_RETURN) && !predicted_by_p (bb, PRED_NEGATIVE_RETURN) @@ -1314,7 +1314,7 @@ tree_estimate_probability (void) fast paths trought function. */ if (e->dest == EXIT_BLOCK_PTR && TREE_CODE (last_stmt (bb)) == RETURN_EXPR - && EDGE_COUNT (bb->preds) > 1) + && !single_pred_p (bb)) { edge e1; edge_iterator ei1; @@ -1457,8 +1457,8 @@ last_basic_block_p (basic_block bb) return (bb->next_bb == EXIT_BLOCK_PTR || (bb->next_bb->next_bb == EXIT_BLOCK_PTR - && EDGE_COUNT (bb->succs) == 1 - && EDGE_SUCC (bb, 0)->dest->next_bb == EXIT_BLOCK_PTR)); + && single_succ_p (bb) + && single_succ (bb)->next_bb == EXIT_BLOCK_PTR)); } /* Sets branch probabilities according to PREDiction and @@ -1811,7 +1811,7 @@ estimate_bb_frequencies (struct loops *loops) mark_dfs_back_edges (); - EDGE_SUCC (ENTRY_BLOCK_PTR, 0)->probability = REG_BR_PROB_BASE; + single_succ_edge (ENTRY_BLOCK_PTR)->probability = REG_BR_PROB_BASE; /* Set up block info for each basic block. */ tovisit = BITMAP_ALLOC (NULL); |