(combinable_i3pat): Bring back to sync with can_combine_p.

From-SVN: r13274

diff --git a/gcc/combine.c b/gcc/combine.c
index 47caa0751a6e213325b263e14bef224b6da93896..683765f407c3d7106cad5d90efbca0368ba0868e 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -1143,13 +1143,17 @@ combinable_i3pat (i3, loc, i2dest, i1dest, i1_not_in_src, pi3dest_killed)
               || (i1dest && reg_overlap_mentioned_p (i1dest, inner_dest))))
          /* This is the same test done in can_combine_p except that we
             allow a hard register with SMALL_REGISTER_CLASSES if SRC is a
-            CALL operation.  */
+            CALL operation.
+            Moreover, we can't test all_adjacent; we don't have to, since
+            this instruction will stay in place, thus we are not considering
+            to increase the lifetime of INNER_DEST.  */
          || (GET_CODE (inner_dest) == REG
              && REGNO (inner_dest) < FIRST_PSEUDO_REGISTER
              && (! HARD_REGNO_MODE_OK (REGNO (inner_dest),
                                        GET_MODE (inner_dest))
 #ifdef SMALL_REGISTER_CLASSES
-                || (GET_CODE (src) != CALL && ! REG_USERVAR_P (inner_dest))
+                || (GET_CODE (src) != CALL && ! REG_USERVAR_P (inner_dest)
+                    && FUNCTION_VALUE_REGNO_P (REGNO (inner_dest)))
 #endif
                  ))
          || (i1_not_in_src && reg_overlap_mentioned_p (i1dest, src)))