diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ddd4325c68..0acf31f32cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-29  Diego Novillo  <dnovillo@redhat.com>
+
+	PR 22550
+	* tree-cfgcleanup.c (cleanup_tree_cfg_1): Extract from ...
+	(cleanup_tree_cfg): ... here.
+	Call cleanup_tree_cfg_1 until there are no more cleanups to
+	do.
+
 2005-07-29  James A. Morrison  <phython@gcc.gnu.org>
 
 	* tree-vrp.c (compare_range_with_value): Return true or false
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cf45c8aef58..aa60bc1a194 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-29  Diego Novillo  <dnovillo@redhat.com>
+
+	PR 22550
+	* g++.dg/tree-ssa/pr22550.C: New test.
+
 2005-07-29  James A. Morrison  <phython@gcc.gnu.org>
 
 	* gcc.dg/tree-ssa/vrp19.c: New test.
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr22550.C b/gcc/testsuite/g++.dg/tree-ssa/pr22550.C
new file mode 100644
index 00000000000..5f557762069
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr22550.C
@@ -0,0 +1,28 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+class X {
+public:
+  int mfunc1 () {
+    return 1;
+  }
+  int mfunc2 () {
+    return 2;
+  }
+  X (int a, int b) { }
+};
+
+typedef int (X::*memfunc_p_t) ();
+
+memfunc_p_t mf_arr[2] = { &X::mfunc1, &X::mfunc2 };
+
+int
+main ()
+{
+  // Get pntr to the array of pointers to member-funcs
+  memfunc_p_t (*mf_arr_p)[2] = &mf_arr;
+  // Compare indirect against direct access to an array element
+  if ((*mf_arr_p)[0] != mf_arr[0])
+    return 1;
+  return 0;
+}
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 51b2fc59465..f2454b01119 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -489,14 +489,12 @@ cleanup_forwarder_blocks (void)
   return changed;
 }
 
-/* Remove unreachable blocks and other miscellaneous clean up work.  */
+/* Do one round of CFG cleanup.  */
 
-bool
-cleanup_tree_cfg (void)
+static bool
+cleanup_tree_cfg_1 (void)
 {
-  bool retval = false;
-
-  timevar_push (TV_TREE_CLEANUP_CFG);
+  bool retval;
 
   retval = cleanup_control_flow ();
   retval |= delete_unreachable_blocks ();
@@ -516,6 +514,28 @@ cleanup_tree_cfg (void)
       end_recording_case_labels ();
     }
 
+  /* Merging the blocks may create new opportunities for folding
+     conditional branches (due to the elimination of single-valued PHI
+     nodes).  */
+  retval |= merge_seq_blocks ();
+
+  return retval;
+}
+
+
+/* Remove unreachable blocks and other miscellaneous clean up work.  */
+
+bool
+cleanup_tree_cfg (void)
+{
+  bool retval;
+  int i;
+
+  timevar_push (TV_TREE_CLEANUP_CFG);
+
+  for (retval = true, i = 0; i < 5 && retval; i++)
+    retval = cleanup_tree_cfg_1 ();
+
 #ifdef ENABLE_CHECKING
   if (retval)
     {
@@ -526,16 +546,14 @@ cleanup_tree_cfg (void)
     }
 #endif
 
-  /* Merging the blocks creates no new opportunities for the other
-     optimizations, so do it here.  */
-  retval |= merge_seq_blocks ();
-
   compact_blocks ();
 
 #ifdef ENABLE_CHECKING
   verify_flow_info ();
 #endif
+
   timevar_pop (TV_TREE_CLEANUP_CFG);
+
   return retval;
 }