Back out my previous patch; causes bootstrap problem for Ada (86 Linux)

From-SVN: r53671

1 files changed, 6 insertions, 8 deletions

diff --git a/gcc/combine.c b/gcc/combine.c
index 7a5604f..9415728 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;