From: Dale Johannesen Date: Mon, 20 May 2002 18:20:45 +0000 (+0000) Subject: Back out my previous patch; causes bootstrap problem for Ada (86 Linux) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c11675d61bdd9609e4a3e100e3e59eec85dbe4e;p=gcc.git Back out my previous patch; causes bootstrap problem for Ada (86 Linux) From-SVN: r53671 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc31e66ff0b..542f442a426 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2002-05-20 Dale Johannesen + * combine.c (cant_combine_insn_p): Back out my + previous patch. + 2002-05-20 Kazu Hirata * params.c: Fix formatting. diff --git a/gcc/combine.c b/gcc/combine.c index 7a5604fc56c..9415728d630 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -1460,10 +1460,10 @@ cant_combine_insn_p (insn) if (! INSN_P (insn)) return 1; - /* Never combine loads and stores involving hard regs that are likely - to be spilled. The register allocator can usually handle such - reg-reg moves by tying. If we allow the combiner to make - substitutions of likely-spilled regs, we may abort in reload. + /* Never combine loads and stores involving hard regs. The register + allocator can usually handle such reg-reg moves by tying. If we allow + the combiner to make substitutions of hard regs, we risk aborting in + reload on machines that have SMALL_REGISTER_CLASSES. As an exception, we allow combinations involving fixed regs; these are not available to the register allocator so there's no risk involved. */ @@ -1478,11 +1478,9 @@ cant_combine_insn_p (insn) dest = SUBREG_REG (dest); if (REG_P (src) && REG_P (dest) && ((REGNO (src) < FIRST_PSEUDO_REGISTER - && ! fixed_regs[REGNO (src)] - && CLASS_LIKELY_SPILLED_P (REGNO_REG_CLASS (REGNO (src)))) + && ! fixed_regs[REGNO (src)]) || (REGNO (dest) < FIRST_PSEUDO_REGISTER - && ! fixed_regs[REGNO (dest)] - && CLASS_LIKELY_SPILLED_P (REGNO_REG_CLASS (REGNO (dest)))))) + && ! fixed_regs[REGNO (dest)]))) return 1; return 0;