diff options
| -rw-r--r-- | gcc/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/loop-invariant.c | 19 |
2 files changed, 25 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2d125ef96d8..af3ee368e13 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2005-11-11 Steven Bosscher <stevenb@suse.de> + + PR 24265 + * loop-invariant.c (may_assign_reg_p): Make sure a hard register + can be assigned to. + (find_invariant_insn): Do the cheapest check, may_assign_reg_p, + before check_maybe_invariant. + (move_invariant_reg): Use gen_move_insn instead of replacing + SET_DEST with the temporary for the invariant. + (move_loop_invariants): If checking is enabled, do internal + consistency checks after completing the pass. + 2005-11-11 David Edelsohn <edelsohn@gnu.org> PR 24644 diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c index 7765a0eda35..dc35aceed3b 100644 --- a/gcc/loop-invariant.c +++ b/gcc/loop-invariant.c @@ -291,7 +291,10 @@ find_exits (struct loop *loop, basic_block *body, static bool may_assign_reg_p (rtx x) { - return can_copy_p (GET_MODE (x)); + return (can_copy_p (GET_MODE (x)) + && (!REG_P (x) + || !HARD_REGISTER_P (x) + || REGNO_REG_CLASS (REGNO (x)) != NO_REGS)); } /* Finds definitions that may correspond to invariants in LOOP with body BODY. @@ -436,8 +439,8 @@ find_invariant_insn (rtx insn, bool always_reached, bool always_executed, || HARD_REGISTER_P (dest)) simple = false; - if (!check_maybe_invariant (SET_SRC (set)) - || !may_assign_reg_p (SET_DEST (set))) + if (!may_assign_reg_p (SET_DEST (set)) + || !check_maybe_invariant (SET_SRC (set))) return; if (may_trap_p (PATTERN (insn))) @@ -793,9 +796,9 @@ move_invariant_reg (struct loop *loop, unsigned invno, struct df *df) reg = gen_reg_rtx (GET_MODE (SET_DEST (set))); df_pattern_emit_after (df, gen_move_insn (SET_DEST (set), reg), BLOCK_FOR_INSN (inv->insn), inv->insn); - SET_DEST (set) = reg; - reorder_insns (inv->insn, inv->insn, BB_END (preheader)); - df_insn_modify (df, preheader, inv->insn); + df_pattern_emit_after (df, gen_move_insn (reg, SET_SRC (set)), + preheader, BB_END (preheader)); + df_insn_delete (df, BLOCK_FOR_INSN (inv->insn), inv->insn); /* Replace the uses we know to be dominated. It saves work for copy propagation, and also it is necessary so that dependent invariants @@ -926,4 +929,8 @@ move_loop_invariants (struct loops *loops) free_loop_data (loops->parray[i]); df_finish (df); + +#ifdef ENABLE_CHECKING + verify_flow_info (); +#endif } |