@@ -580,9 +580,9 @@ arcv_sched_reorder2 (rtx_insn **ready, int *n_readyp)
580580 {
581581 if (NONDEBUG_INSN_P (ready[*n_readyp - i])
582582 && !SCHED_GROUP_P (ready[*n_readyp - i])
583- && (!next_insn (ready[*n_readyp - i])
584- || !NONDEBUG_INSN_P (next_insn (ready[*n_readyp - i]))
585- || !SCHED_GROUP_P (next_insn (ready[*n_readyp - i])))
583+ && (!next_nondebug_insn (ready[*n_readyp - i])
584+ || !NONDEBUG_INSN_P (next_nondebug_insn (ready[*n_readyp - i]))
585+ || !SCHED_GROUP_P (next_nondebug_insn (ready[*n_readyp - i])))
586586 && arcv_macro_fusion_pair_p (sched_state.last_scheduled_insn ,
587587 ready[*n_readyp - i]))
588588 {
@@ -606,9 +606,9 @@ arcv_sched_reorder2 (rtx_insn **ready, int *n_readyp)
606606 {
607607 if (NONDEBUG_INSN_P (ready[*n_readyp - i])
608608 && !SCHED_GROUP_P (ready[*n_readyp - i])
609- && (!next_insn (ready[*n_readyp - i])
610- || !NONDEBUG_INSN_P (next_insn (ready[*n_readyp - i]))
611- || !SCHED_GROUP_P (next_insn (ready[*n_readyp - i])))
609+ && (!next_nondebug_insn (ready[*n_readyp - i])
610+ || !NONDEBUG_INSN_P (next_nondebug_insn (ready[*n_readyp - i]))
611+ || !SCHED_GROUP_P (next_nondebug_insn (ready[*n_readyp - i])))
612612 && arcv_macro_fusion_pair_p (sched_state.last_scheduled_insn ,
613613 ready[*n_readyp - i]))
614614 {
@@ -649,14 +649,14 @@ arcv_sched_reorder2 (rtx_insn **ready, int *n_readyp)
649649 && get_attr_type (ready[*n_readyp - i]) != TYPE_LOAD
650650 && get_attr_type (ready[*n_readyp - i]) != TYPE_STORE
651651 && !SCHED_GROUP_P (ready[*n_readyp - i])
652- && ((!next_insn (ready[*n_readyp - i])
653- || !NONDEBUG_INSN_P (next_insn (ready[*n_readyp - i]))
654- || !SCHED_GROUP_P (next_insn (ready[*n_readyp - i])))))
655- || ((next_insn (ready[*n_readyp - i])
656- && NONDEBUG_INSN_P (next_insn (ready[*n_readyp - i]))
657- && recog_memoized (next_insn (ready[*n_readyp - i])) >= 0
658- && get_attr_type (next_insn (ready[*n_readyp - i])) != TYPE_LOAD
659- && get_attr_type (next_insn (ready[*n_readyp - i])) != TYPE_STORE)))
652+ && ((!next_nondebug_insn (ready[*n_readyp - i])
653+ || !NONDEBUG_INSN_P (next_nondebug_insn (ready[*n_readyp - i]))
654+ || !SCHED_GROUP_P (next_nondebug_insn (ready[*n_readyp - i])))))
655+ || ((next_nondebug_insn (ready[*n_readyp - i])
656+ && NONDEBUG_INSN_P (next_nondebug_insn (ready[*n_readyp - i]))
657+ && recog_memoized (next_nondebug_insn (ready[*n_readyp - i])) >= 0
658+ && get_attr_type (next_nondebug_insn (ready[*n_readyp - i])) != TYPE_LOAD
659+ && get_attr_type (next_nondebug_insn (ready[*n_readyp - i])) != TYPE_STORE)))
660660 {
661661 std::swap (ready[*n_readyp - 1 ], ready[*n_readyp - i]);
662662 sched_state.alu_pipe_scheduled_p = 1 ;
0 commit comments