diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1fca143c40..06a315812c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-23  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/53070
+	* tree-if-conv.c (combine_blocks): Free predicates in all blocks.
+	(main_tree_if_conversion): Verify we succeeded in that.
+
 2012-04-23  Jan Hubicka  <jh@suse.cz>
 
 	* lto-symtab.c (lto_cgraph_replace_node): Do not call
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7843587d772..ac080621442 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-23  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/53070
+	* gcc.dg/torture/pr53070.c: New testcase.
+
 2012-04-23  Richard Guenther  <rguenther@suse.de>
 
 	PR c/53060
diff --git a/gcc/testsuite/gcc.dg/torture/pr53070.c b/gcc/testsuite/gcc.dg/torture/pr53070.c
new file mode 100644
index 00000000000..534ac34141f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr53070.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-ffast-math -ftree-loop-if-convert -fno-tree-loop-im" } */
+int
+foo (int c)
+{
+  int t = 0, i = 0;
+  for (; i < 100; i++)
+    t += c ? c : 1;
+  return t;
+}
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 31bb610af08..d8e23a43672 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -1651,8 +1651,8 @@ combine_blocks (struct loop *loop)
       free_bb_predicate (bb);
       if (bb_with_exit_edge_p (loop, bb))
 	{
+	  gcc_assert (exit_bb == NULL);
 	  exit_bb = bb;
-	  break;
 	}
     }
   gcc_assert (exit_bb != loop->latch);
@@ -1779,6 +1779,7 @@ main_tree_if_conversion (void)
   struct loop *loop;
   bool changed = false;
   unsigned todo = 0;
+  basic_block bb;
 
   if (number_of_loops () <= 1)
     return 0;
@@ -1794,6 +1795,11 @@ main_tree_if_conversion (void)
 
   free_dominance_info (CDI_POST_DOMINATORS);
 
+#ifdef ENABLE_CHECKING
+  FOR_EACH_BB (bb)
+    gcc_assert (!bb->aux);
+#endif
+
   return todo;
 }