passes.c (execute_function_todo): Remove dead code.

2019-05-03  Richard Biener  <rguenther@suse.de>

	* passes.c (execute_function_todo): Remove dead code.

From-SVN: r270832

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53428649c371dbe81dcb75388170559537904e02..65df01190cc1ca893fa143e9f985abe0b3c83db1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-03  Richard Biener  <rguenther@suse.de>
+
+       * passes.c (execute_function_todo): Remove dead code.
+
 2019-05-02  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * config/rs6000/rs6000.c (rs6000_dbx_register_number): Do not use

diff --git a/gcc/passes.c b/gcc/passes.c
index 02561f8bf1890b4c942cc6bc85edcb437e3cafb8..a9c22889d71d466150a5c7eb84bcb8a1b37bc429 100644 (file)
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -1924,26 +1924,12 @@ execute_function_todo (function *fn, void *data)
 
   push_cfun (fn);
 
-  /* Always cleanup the CFG before trying to update SSA.  */
+  /* If we need to cleanup the CFG let it perform a needed SSA update.  */
   if (flags & TODO_cleanup_cfg)
-    {
-      cleanup_tree_cfg (flags & TODO_update_ssa_any);
-
-      /* When cleanup_tree_cfg merges consecutive blocks, it may
-        perform some simplistic propagation when removing single
-        valued PHI nodes.  This propagation may, in turn, cause the
-        SSA form to become out-of-date (see PR 22037).  So, even
-        if the parent pass had not scheduled an SSA update, we may
-        still need to do one.  */
-      if (!(flags & TODO_update_ssa_any) && need_ssa_update_p (cfun))
-       flags |= TODO_update_ssa;
-    }
-
-  if (flags & TODO_update_ssa_any)
-    {
-      unsigned update_flags = flags & TODO_update_ssa_any;
-      update_ssa (update_flags);
-    }
+    cleanup_tree_cfg (flags & TODO_update_ssa_any);
+  else if (flags & TODO_update_ssa_any)
+    update_ssa (flags & TODO_update_ssa_any);
+  gcc_assert (!need_ssa_update_p (fn));
 
   if (flag_tree_pta && (flags & TODO_rebuild_alias))
     compute_may_aliases ();