diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1ae3c90bf25..0468d01471c9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2012-08-26  Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
+2012-08-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR rtl-optimization/54088
+	* jump.c (delete_related_insns): Robustify latest change.
+
+2012-08-25  Ricardo Catalinas Jiménez  <jimenezrick@gmail.com>
 
 	* doc/extend.texi (__atomic Builtins): Remove space before comma.
 
diff --git a/gcc/jump.c b/gcc/jump.c
index d0f3f04a3794..c4f674972b87 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -1257,9 +1257,9 @@ delete_related_insns (rtx insn)
 	  && GET_CODE (PATTERN (insn)) == SEQUENCE
 	  && CALL_P (XVECEXP (PATTERN (insn), 0, 0))))
     {
-      rtx p = insn;
+      rtx p;
 
-      for (p = NEXT_INSN (p);
+      for (p = next && INSN_DELETED_P (next) ? NEXT_INSN (next) : next;
 	   p && NOTE_P (p);
 	   p = NEXT_INSN (p))
 	if (NOTE_KIND (p) == NOTE_INSN_CALL_ARG_LOCATION)