(reloads_conflict): Handle R1_TYPE of RELOAD_OTHER.

From-SVN: r7581

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 11e0a1bf4a66ffe57dfddb3b405b6a79c51fd7e7..92e4b51a755028fe86e9436ef75a8f7e8f926c9e 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -4509,11 +4509,9 @@ reloads_conflict (r1, r2)
   int r1_opnum = reload_opnum[r1];
   int r2_opnum = reload_opnum[r2];
 
-  /* RELOAD_OTHER conflicts with everything except
-     RELOAD_FOR_OTHER_ADDRESS.  */
+  /* RELOAD_OTHER conflicts with everything except RELOAD_FOR_OTHER_ADDRESS. */
   
-  if ((r1_type == RELOAD_OTHER && r2_type != RELOAD_FOR_OTHER_ADDRESS)
-      || (r2_type == RELOAD_OTHER && r1_type != RELOAD_FOR_OTHER_ADDRESS))
+  if (r2_type == RELOAD_OTHER && r1_type != RELOAD_FOR_OTHER_ADDRESS)
     return 1;
 
   /* Otherwise, check conflicts differently for each type.  */
@@ -4556,6 +4554,9 @@ reloads_conflict (r1, r2)
     case RELOAD_FOR_OTHER_ADDRESS:
       return r2_type == RELOAD_FOR_OTHER_ADDRESS;
 
+    case RELOAD_OTHER:
+      return r2_type != RELOAD_FOR_OTHER_ADDRESS;
+
     default:
       abort ();
     }