diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-08-21 21:02:34 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2014-08-21 21:02:34 +0000 |
| commit | da5477a930cfa15554c08a951faa12d740623dd5 (patch) | |
| tree | db7f3c0f53d71518c200853007e36b9008ea6916 /gcc/ifcvt.c | |
| parent | 3bbd58151e8b45501da6b011f9607be86a963bed (diff) | |
| download | gcc-da5477a930cfa15554c08a951faa12d740623dd5.zip gcc-da5477a930cfa15554c08a951faa12d740623dd5.tar.gz gcc-da5477a930cfa15554c08a951faa12d740623dd5.tar.bz2 | |
cfgcleanup.c: Use rtx_insn (also touches basic-block.h and ifcvt.c)
gcc/
2014-08-21 David Malcolm <dmalcolm@redhat.com>
* basic-block.h (flow_find_cross_jump): Strengthen params 3 and 4
"f1" and "f2" from rtx * to rtx_insn **.
(flow_find_head_matching_sequence): Likewise.
* cfgcleanup.c (try_simplify_condjump): Strengthen local
"cbranch_insn" from rtx to rtx_insn *.
(thread_jump): Likewise for local "insn".
(try_forward_edges): Likewise for local "last".
(merge_blocks_move_predecessor_nojumps): Likewise for local "barrier".
(merge_blocks_move_successor_nojumps): Likewise for locals "barrier",
"real_b_end".
(can_replace_by): Likewise for params "i1", "i2".
(old_insns_match_p): Likewise.
(merge_notes): Likewise.
(walk_to_nondebug_insn): Likewise for param "i1".
(flow_find_cross_jump): Strengthen params "f1" and "f2" from rtx *
to rtx_insn **. Strengthen locals "i1", "i2", "last1", "last2",
"afterlast1", "afterlast2" from rtx to rtx_insn *.
(flow_find_head_matching_sequence): Strengthen params "f1" and
"f2" from rtx * to rtx_insn **. Strengthen locals "i1", "i2",
"last1", "last2", "beforelast1", "beforelast2" from rtx to
rtx_insn *.
(outgoing_edges_match): Likewise for locals "last1", "last2".
(try_crossjump_to_edge): Likewise for local "insn".
Replace call to for_each_rtx with for_each_rtx_in_insn.
(try_crossjump_to_edge): Likewise for locals "newpos1", "newpos2".
(try_head_merge_bb): Likewise for locals "e0_last_head_, "jump",
"e0_last", "e_last", "head", "curr", "insn". Strengthen locals
"headptr", "currptr", "nextptr" from rtx * to rtx_insn **.
(try_optimize_cfg): Strengthen local "last" from rtx to
rtx_insn *.
(delete_dead_jumptables): Likewise for locals "insn", "next",
"label".
* ifcvt.c (cond_exec_process_if_block): Likewise for locals
"rtx then_last_head", "rtx else_last_head", "rtx then_first_tail",
"rtx else_first_tail", to reflect the basic-block.h changes above.
From-SVN: r214292
Diffstat (limited to 'gcc/ifcvt.c')
| -rw-r--r-- | gcc/ifcvt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 8e0f3bd..c1894bb 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -476,10 +476,10 @@ cond_exec_process_if_block (ce_if_block * ce_info, rtx false_expr; /* test for then block insns */ int true_prob_val; /* probability of else block */ int false_prob_val; /* probability of then block */ - rtx then_last_head = NULL_RTX; /* Last match at the head of THEN */ - rtx else_last_head = NULL_RTX; /* Last match at the head of ELSE */ - rtx then_first_tail = NULL_RTX; /* First match at the tail of THEN */ - rtx else_first_tail = NULL_RTX; /* First match at the tail of ELSE */ + rtx_insn *then_last_head = NULL; /* Last match at the head of THEN */ + rtx_insn *else_last_head = NULL; /* Last match at the head of ELSE */ + rtx_insn *then_first_tail = NULL; /* First match at the tail of THEN */ + rtx_insn *else_first_tail = NULL; /* First match at the tail of ELSE */ int then_n_insns, else_n_insns, n_insns; enum rtx_code false_code; rtx note; |