diff options
Diffstat (limited to 'gcc/config/frv/frv.c')
| -rw-r--r-- | gcc/config/frv/frv.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c index b54c085858d..f0301468631 100644 --- a/gcc/config/frv/frv.c +++ b/gcc/config/frv/frv.c @@ -5265,13 +5265,15 @@ frv_ifcvt_modify_tests (ce_if_block_t *ce_info, rtx *p_true, rtx *p_false) for (j = CC_FIRST; j <= CC_LAST; j++) if (TEST_HARD_REG_BIT (tmp_reg->regs, j)) { - if (REGNO_REG_SET_P (then_bb->global_live_at_start, j)) + if (REGNO_REG_SET_P (then_bb->il.rtl->global_live_at_start, j)) continue; - if (else_bb && REGNO_REG_SET_P (else_bb->global_live_at_start, j)) + if (else_bb + && REGNO_REG_SET_P (else_bb->il.rtl->global_live_at_start, j)) continue; - if (join_bb && REGNO_REG_SET_P (join_bb->global_live_at_start, j)) + if (join_bb + && REGNO_REG_SET_P (join_bb->il.rtl->global_live_at_start, j)) continue; SET_HARD_REG_BIT (frv_ifcvt.nested_cc_ok_rewrite, j); @@ -5293,7 +5295,7 @@ frv_ifcvt_modify_tests (ce_if_block_t *ce_info, rtx *p_true, rtx *p_false) /* Remove anything live at the beginning of the join block from being available for allocation. */ - EXECUTE_IF_SET_IN_REG_SET (join_bb->global_live_at_start, 0, regno, rsi) + EXECUTE_IF_SET_IN_REG_SET (join_bb->il.rtl->global_live_at_start, 0, regno, rsi) { if (regno < FIRST_PSEUDO_REGISTER) CLEAR_HARD_REG_BIT (tmp_reg->regs, regno); @@ -5337,7 +5339,7 @@ frv_ifcvt_modify_tests (ce_if_block_t *ce_info, rtx *p_true, rtx *p_false) /* Anything live at the beginning of the block is obviously unavailable for allocation. */ - EXECUTE_IF_SET_IN_REG_SET (bb[j]->global_live_at_start, 0, regno, rsi) + EXECUTE_IF_SET_IN_REG_SET (bb[j]->il.rtl->global_live_at_start, 0, regno, rsi) { if (regno < FIRST_PSEUDO_REGISTER) CLEAR_HARD_REG_BIT (tmp_reg->regs, regno); @@ -5991,7 +5993,7 @@ frv_ifcvt_modify_insn (ce_if_block_t *ce_info, severely. */ && ce_info->join_bb && ! (REGNO_REG_SET_P - (ce_info->join_bb->global_live_at_start, + (ce_info->join_bb->il.rtl->global_live_at_start, REGNO (SET_DEST (set)))) /* Similarly, we must not unconditionally set a reg used as scratch in the THEN branch if the same reg @@ -5999,7 +6001,7 @@ frv_ifcvt_modify_insn (ce_if_block_t *ce_info, && (! ce_info->else_bb || BLOCK_FOR_INSN (insn) == ce_info->else_bb || ! (REGNO_REG_SET_P - (ce_info->else_bb->global_live_at_start, + (ce_info->else_bb->il.rtl->global_live_at_start, REGNO (SET_DEST (set)))))) pattern = set; |