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);