Remove last combine patch. rth & jim are working on a new one.

From-SVN: r16304

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 24f3fc2..e38e428 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -8,15 +8,6 @@ Sun Nov  2 23:31:43 1997  Manfred Hollstein  <manfred@s-direktnet.de>
        14 char length.
        * configure: Rebuild.
 
-Sun Nov  2 23:21:36 1997  Richard Henderson  <rth@cygnus.com>
-                          Jim Wilson  <wilson@cygnus.com>
-
-        * combine.c (try_combine): Don't elim_i1 when it is used in i2src.
-
-        * combine.c (try_combine): When setting elim_i2, check whether newi2pat
-        sets i2dest.  When calling distribute_notes for i3dest_killed, pass
-        elim_i2 and elim_i1.
-
 Sun Nov  2 19:44:00 1997  Robert Lipe (robertl@dgii.com)
 
        * i386/sco5.h: enable -gstabs once again.

diff --git a/gcc/combine.c b/gcc/combine.c
index 80fac52..20bcaf9 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -1240,7 +1240,6 @@ try_combine (i3, i2, i1)
   rtx i2pat;
   /* Indicates if I2DEST or I1DEST is in I2SRC or I1_SRC.  */
   int i2dest_in_i2src = 0, i1dest_in_i1src = 0, i2dest_in_i1src = 0;
-  int i1dest_in_i2src = 0;
   int i1_feeds_i3 = 0;
   /* Notes that must be added to REG_NOTES in I3 and I2.  */
   rtx new_i3_notes, new_i2_notes;
@@ -1424,7 +1423,6 @@ try_combine (i3, i2, i1)
   i2dest_in_i2src = reg_overlap_mentioned_p (i2dest, i2src);
   i1dest_in_i1src = i1 && reg_overlap_mentioned_p (i1dest, i1src);
   i2dest_in_i1src = i1 && reg_overlap_mentioned_p (i2dest, i1src);
-  i1dest_in_i2src = i1 && reg_overlap_mentioned_p (i1dest, i2src);
 
   /* See if I1 directly feeds into I3.  It does if I1DEST is not used
      in I2SRC.  */
@@ -2148,12 +2146,10 @@ try_combine (i3, i2, i1)
     rtx i3links, i2links, i1links = 0;
     rtx midnotes = 0;
     register int regno;
-    /* Compute which registers we expect to eliminate.  newi2pat may be setting
-       either i3dest or i2dest, so we must check it.  */
-    rtx elim_i2 = ((newi2pat && reg_set_p (i2dest, newi2pat))
-                  || i2dest_in_i2src || i2dest_in_i1src
+    /* Compute which registers we expect to eliminate.  */
+    rtx elim_i2 = (newi2pat || i2dest_in_i2src || i2dest_in_i1src
                   ? 0 : i2dest);
-    rtx elim_i1 = i1 == 0 || i1dest_in_i1src || i1dest_in_i2src ? 0 : i1dest;
+    rtx elim_i1 = i1 == 0 || i1dest_in_i1src ? 0 : i1dest;
 
     /* Get the old REG_NOTES and LOG_LINKS from all our insns and
        clear them.  */
@@ -2321,7 +2317,7 @@ try_combine (i3, i2, i1)
          distribute_notes (gen_rtx (EXPR_LIST, REG_DEAD, i3dest_killed,
                                     NULL_RTX),
                            NULL_RTX, i3, newi2pat ? i2 : NULL_RTX,
-                           elim_i2, elim_i1);
+                           NULL_RTX, NULL_RTX);
       }
 
     if (i2dest_in_i2src)