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

From-SVN: r53671

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc31e66ff0b6c3fe2cc068868ee4a89264f62748..542f442a4263b815545020545c360c8605aa84d6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-20  Dale Johannesen  <dalej@apple.com>
+        * combine.c (cant_combine_insn_p):  Back out my
+        previous patch.
+
 2002-05-20  Kazu Hirata  <kazu@cs.umass.edu>
 
        * params.c: Fix formatting.

diff --git a/gcc/combine.c b/gcc/combine.c
index 7a5604fc56c36d423adb6b4c50691e4c553baeb8..9415728d6307771834a90248c1e0c4b98507fe22 100644 (file)
--- 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;