diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2e4a86f3c2a5bdeac7b9be129a4ea35f2924856..d38c54986e9ac5d60df98dc74dbdf8d4d946efbe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-05  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR middle-end/48441
+	* cprop.c (one_cprop_pass): Do not mark_oprs_set of deleted insns.
+
 2011-04-05  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* combine.c: Include obstack.h.
diff --git a/gcc/cprop.c b/gcc/cprop.c
index b9235f176c37dd2da215fac51c3800e659af90f9..74520e38f41b9caaf2cba16034d8e4d09798acf9 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -1797,8 +1797,8 @@ one_cprop_pass (void)
 		/* Keep track of everything modified by this insn.  */
 		/* ??? Need to be careful w.r.t. mods done to INSN.
 		       Don't call mark_oprs_set if we turned the
-		       insn into a NOTE.  */
-		if (! NOTE_P (insn))
+		       insn into a NOTE, or deleted the insn.  */
+		if (! NOTE_P (insn) && ! INSN_DELETED_P (insn))
 		  mark_oprs_set (insn);
 	      }
 	}