From 0c94f956cf3f91faa1ec0364568fa51ad51d1a91 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Thu, 14 Jan 2010 14:13:36 +0300 Subject: [PATCH] sel-sched.c (mark_unavailable_hard_regs): Do not try to search available registers when failed to discover LHS register class. 2010-01-14 Alexander Monakov * sel-sched.c (mark_unavailable_hard_regs): Do not try to search available registers when failed to discover LHS register class. Fix indentation. Update comment. From-SVN: r155896 --- gcc/ChangeLog | 6 ++++++ gcc/sel-sched.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1f9b351d4b18..56375a97b471 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-01-14 Alexander Monakov + + * sel-sched.c (mark_unavailable_hard_regs): Do not try to search + available registers when failed to discover LHS register class. + Fix indentation. Update comment. + 2010-01-14 Andrey Belevantsev Alexander Monakov diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 1b8f47187a92..7fb08828b976 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -1229,19 +1229,19 @@ mark_unavailable_hard_regs (def_t def, struct reg_rename *reg_rename_p, if (!reload_completed && !HARD_REGISTER_NUM_P (regno)) return; - mode = GET_MODE (orig_dest); + if (reload_completed) + cl = get_reg_class (def->orig_insn); - /* Stop when mode is not supported for renaming. Also can't proceed - if the original register is one of the fixed_regs, global_regs or - frame pointer. */ + /* Stop if the original register is one of the fixed_regs, global_regs or + frame pointer, or we could not discover its class. */ if (fixed_regs[regno] || global_regs[regno] #if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM - || (frame_pointer_needed && regno == HARD_FRAME_POINTER_REGNUM) + || (frame_pointer_needed && regno == HARD_FRAME_POINTER_REGNUM) #else - || (frame_pointer_needed && regno == FRAME_POINTER_REGNUM) + || (frame_pointer_needed && regno == FRAME_POINTER_REGNUM) #endif - ) + || (reload_completed && cl == NO_REGS)) { SET_HARD_REG_SET (reg_rename_p->unavailable_hard_regs); @@ -1296,11 +1296,11 @@ mark_unavailable_hard_regs (def_t def, struct reg_rename *reg_rename_p, /* Leave regs as 'available' only from the current register class. */ - cl = get_reg_class (def->orig_insn); - gcc_assert (cl != NO_REGS); COPY_HARD_REG_SET (reg_rename_p->available_for_renaming, reg_class_contents[cl]); + mode = GET_MODE (orig_dest); + /* Leave only registers available for this mode. */ if (!sel_hrd.regs_for_mode_ok[mode]) init_regs_for_mode (mode); -- 2.47.2