diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1559b9af7d5..c099a2c54e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-13  Alexandre Oliva  <aoliva@redhat.com>
+
+	* df-problems.c (df_note_bb_compute): Do not take note of
+	debug uses for whose REGs we won't emit DEAD or UNUSED notes.
+
 2012-04-13  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR debug/51570
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index c9fc91bd376..6912e11e498 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -3453,7 +3453,12 @@ df_note_bb_compute (unsigned int bb_index,
 		{
 		  if (debug_insn > 0)
 		    {
-		      dead_debug_add (&debug, use, uregno);
+		      /* We won't add REG_UNUSED or REG_DEAD notes for
+			 these, so we don't have to mess with them in
+			 debug insns either.  */
+		      if (!bitmap_bit_p (artificial_uses, uregno)
+			  && !df_ignore_stack_reg (uregno))
+			dead_debug_add (&debug, use, uregno);
 		      continue;
 		    }
 		  break;