(eliminate_regs_in_insn): Rerecognize if move insn becomes a non-move.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@2257 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/reload1.c b/gcc/reload1.c
index a6d95ef..42dedca 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -2987,9 +2987,21 @@ eliminate_regs_in_insn (insn, replace)
   new_body = eliminate_regs (old_body, 0, replace ? insn : NULL_RTX);
   if (new_body != old_body)
     {
-      if (GET_CODE (old_body) != SET || GET_CODE (SET_SRC (old_body)) != PLUS
-         || ! validate_change (insn, &PATTERN (insn), new_body, 0))
+      /* If we had a move insn but now we don't, rerecognize it.  */
+      if (GET_CODE (old_body) == SET && GET_CODE (SET_SRC (old_body)) == REG
+         && (GET_CODE (new_body) != SET
+             || GET_CODE (SET_SRC (new_body)) != REG))
+       {
+         if (! validate_change (insn, &PATTERN (insn), new_body, 0))
+           abort ();
+       }
+      /* If this was not a move insn, rerecognize.  */
+      else if (GET_CODE (old_body) != SET
+              || GET_CODE (SET_SRC (old_body)) != PLUS
+              || ! validate_change (insn, &PATTERN (insn), new_body, 0))
        PATTERN (insn) = new_body;
+      /* ??? Is it really correct to store the new body anyway
+        if validate_change fails?  Shouldn't this abort instead?  */
 
       if (replace && REG_NOTES (insn))
        REG_NOTES (insn) = eliminate_regs (REG_NOTES (insn), 0, NULL_RTX);