diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a6754a00c297250f06fabdb67ad909a2d3395ec4..e64b233ac6bf3e79434816e5ba82c4632730829f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
+2008-04-02  Andy Hutchinson <hutchinsonamdy@aim.com>
+
+	PR rtl-optimization/35542
+	* fwprop.c (forward_propagate_and_simplify): Replace
+	loc_reg_mentioned_in_p with reg_mentioned_p.
+
 2008-04-02  Paolo Bonzini  <bonzini@gnu.org>
 
+	PR rtl-optimization/35281
 	* fwprop.c (PR_CAN_APPEAR, PR_HANDLE_MEM): New.
 	(propagate_rtx_1): Handle PR_HANDLE_MEM.
 	(propagate_rtx): Pass PR_HANDLE_MEM if appropriate.
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index 2566cbbb89ec64383320fb20e6a4ed94246475bc..4d97c9c4ecd5bdc373cc33d81eaa1f770dd26910 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -967,7 +967,7 @@ forward_propagate_into (struct df_ref *use)
   else
     parent = PATTERN (use_insn);
 
-  if (!loc_mentioned_in_p (DF_REF_LOC (use), parent))
+  if (!reg_mentioned_p (DF_REF_REG (use), parent))
     return;
 
   def_insn = DF_REF_INSN (def);