combine.c (try_combine): Use any_condjump_p...

        * combine.c (try_combine): Use any_condjump_p, any_uncondjump_p
        and pc_set at the place of simplejump_p and condjump_p.
        * cse.c (record_jump_equiv): Likewise.
        * emit-rtl.c (emit): Likewise.
        * explow.c (find_next_ref): Likewise.
        * flow.c (tidy_fallthru_edge): Likewise.
        (init_propagate_block_info): Likewise.
        * gcse.c (delete_null_pointer_checks): Likewise.
        * ifcvt.c (cond_exec_get_condition, noce_get_condition,
        dead_or_predicable): Likewise.
        * integrate.c (copy_insn_list): Likewise.
        * loop.c (scan_loop, verify_dominator, find_and_verify_loops,
        for_each_insn_in_loop, check_dbra_loop, get_condition,
        insert_bct, load_mems): Likewise.
        * resource.c (find_dead_or_set_registers): Likewise.
        * sibcalls.c (simplejump_p): Likewise.
        * unroll.c (copy_loop_body, reg_dead_after_loop): Likewise.

From-SVN: r34175

1 files changed, 3 insertions, 3 deletions

diff --git a/gcc/jump.c b/gcc/jump.c
index cf4d78d..a5e8787 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -553,16 +553,16 @@ jump_optimize_1 (f, cross_jump, noop_moves, after_regscan,
 		   && GET_CODE (PATTERN (temp)) == TRAP_IF
 		   && (this_is_any_uncondjump
 		       || (this_is_any_condjump
-			   && temp2 = get_condition (insn, &temp4))))
+			   && (temp2 = get_condition (insn, &temp4)))))
 	    {
 	      rtx tc = TRAP_CONDITION (PATTERN (temp));
 
 	      if (tc == const_true_rtx
-		  || (! this_is_uncondjump && rtx_equal_p (temp2, tc)))
+		  || (! this_is_any_uncondjump && rtx_equal_p (temp2, tc)))
 		{
 		  rtx new;
 		  /* Replace an unconditional jump to a trap with a trap.  */
-		  if (this_is_uncondjump)
+		  if (this_is_any_uncondjump)
 		    {
 		      emit_barrier_after (emit_insn_before (gen_trap (), insn));
 		      delete_jump (insn);