diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 20a836aa095..3c85e029659 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/46629
+	* cfgexpand.c (maybe_cleanup_end_of_block): Test NEXT_INSN (insn)
+	instead of insn with any_condjump_p.
+
 2010-11-24  Mingjie Xing  <mingjie.xing@gmail.com>
 
 	* config/mips/loongson.md: Change the description comment of the file
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index a65f12ba490..f15e4e02dba 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -1695,7 +1695,7 @@ maybe_cleanup_end_of_block (edge e, rtx last)
 	  insn = PREV_INSN (insn);
 	  if (JUMP_P (NEXT_INSN (insn)))
 	    {
-	      if (!any_condjump_p (insn))
+	      if (!any_condjump_p (NEXT_INSN (insn)))
 		{
 		  gcc_assert (BARRIER_P (NEXT_INSN (NEXT_INSN (insn))));
 		  delete_insn (NEXT_INSN (NEXT_INSN (insn)));