From f829381353001aebad1e6327f113f5dab907b4a2 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 10 Jan 2014 16:08:49 -0500 Subject: [PATCH 156/159] FIXME: cfgcleanup.c --- gcc/cfgcleanup.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index b9b3250..1f54fb1 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -69,7 +69,8 @@ static bool block_was_dirty; static bool try_crossjump_to_edge (int, edge, edge, enum replace_direction); static bool try_crossjump_bb (int, basic_block); static bool outgoing_edges_match (int, basic_block, basic_block); -static enum replace_direction old_insns_match_p (int, rtx, rtx); +static enum replace_direction old_insns_match_p (int, rtx_base_insn, + rtx_base_insn); static void merge_blocks_move_predecessor_nojumps (basic_block, basic_block); static void merge_blocks_move_successor_nojumps (basic_block, basic_block); @@ -1013,7 +1014,7 @@ equal_different_set_p (rtx p1, rtx s1, rtx p2, rtx s2) - dir_both if both are the case. */ static enum replace_direction -can_replace_by (rtx i1, rtx i2) +can_replace_by (rtx_base_insn i1, rtx_base_insn i2) { rtx s1, s2, d1, d2, src1, src2, note1, note2; bool c1, c2; @@ -1092,7 +1093,8 @@ merge_dir (enum replace_direction a, enum replace_direction b) - dir_both if both are the case. */ static enum replace_direction -old_insns_match_p (int mode ATTRIBUTE_UNUSED, rtx i1, rtx i2) +old_insns_match_p (int mode ATTRIBUTE_UNUSED, rtx_base_insn i1, + rtx_base_insn i2) { rtx p1, p2; @@ -1753,8 +1755,8 @@ outgoing_edges_match (int mode, basic_block bb1, basic_block bb2) stop when we see the NOTE_INSN_BASIC_BLOCK, as old_insns_match_p handles that case specially. old_insns_match_p does not handle other types of instruction notes. */ - rtx last1 = BB_END (bb1); - rtx last2 = BB_END (bb2); + rtx_base_insn last1 = BB_END (bb1); + rtx_base_insn last2 = BB_END (bb2); while (!NOTE_INSN_BASIC_BLOCK_P (last1) && (DEBUG_INSN_P (last1) || NOTE_P (last1))) last1 = PREV_INSN (last1); -- 1.7.11.7