(reload): Fix error in last change; only check against group reloads

and check all reloads.

From-SVN: r6866

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 4bbd43a02aa46f2b6088927ffaa4ba2dc6275a87..4e7a362ee4c87435618d47ee31a574fefbdd3c0d 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -1149,12 +1149,21 @@ reload (first, global, dumpfile)
                  size = CLASS_MAX_NREGS (class, mode);
 
                  /* If this class doesn't want a group determine if
-                    we have a nongroup need or a regular need. */
+                    we have a nongroup need or a regular need.  We have
+                    a nongroup need if this reload conflicts with a
+                    group reload whose class intersects with this reload's
+                    class.  */
 
                  nongroup_need = 0;
                  if (size == 1)
-                   for (j = i + 1; j < n_reloads; j++)
-                     if (reloads_conflict (i, j)
+                   for (j = 0; j < n_reloads; j++)
+                     if ((CLASS_MAX_NREGS (reload_reg_class[j],
+                                           (GET_MODE_SIZE (reload_outmode[i])
+                                            > GET_MODE_SIZE (reload_inmode[i]))
+                                           ? reload_outmode[i]
+                                           : reload_inmode[i])
+                          > 1)
+                         && reloads_conflict (i, j)
                          && reg_classes_intersect_p (class,
                                                      reload_reg_class[j]))
                        {