simplify-rtx.c (simplify_replace_rtx): Do not blindly replace hard registers.

	* simplify-rtx.c (simplify_replace_rtx): Do not blindly replace
	hard registers.

[[Split portion of a mixed commit.]]

Co-Authored-By: Aldy Hernandez <aldyh@redhat.com>

From-SVN: r92278.2

gcc/ChangeLog

+2004-12-16  Richard Henderson  <rth@redhat.com>
+	    Aldy Hernandez  <aldyh@redhat.com>
+
+	* simplify-rtx.c (simplify_replace_rtx): Do not blindly replace
+	hard registers.
+
 2004-12-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR other/18508

gcc/simplify-rtx.c

@@ -337,7 +337,7 @@ simplify_replace_rtx (rtx x, rtx old_rtx, rtx new_rtx)
 	}
       else if (code == REG)
 	{
-	  if (REG_P (old_rtx) && REGNO (x) == REGNO (old_rtx))
+	  if (rtx_equal_p (x, old_rtx))
 	    return new_rtx;
 	}
       break;