From: David Li <davidxl@google.com>
Date: Tue, 14 Jun 2011 19:39:36 +0000 (+0000)
Subject: dumping cleanup phase 1 -- Removing TODO_dump_func
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22c5fa5fbfd9634c3389f845e77ddf8e6ea32f7b;p=gcc.git

dumping cleanup phase 1 -- Removing TODO_dump_func

From-SVN: r175051
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ee8030f799..b293ce442b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,100 @@
+2011-06-14  David Li  <davidxl@google.com>
+
+	* passes.c (execute_function_todo): Remove TODO_dump_func.
+	(execute_one_pass): Remove TODO_dump_func.
+	(execute_function_dump): New function.
+	* tree-vrp.c: Remove TODO_dump_func.
+	* regrename.c: Remove TODO_dump_func.
+	* fwprop.c: Remove TODO_dump_func.
+	* tree-into-ssa.c: Remove TODO_dump_func.
+	* tree-complex.c: Remove TODO_dump_func.
+	* tracer.c: Remove TODO_dump_func.
+	* tree-loop-distribution.c: Remove TODO_dump_func.
+	* postreload-gcse.c: Remove TODO_dump_func.
+	* postreload.c: Remove TODO_dump_func.
+	* tree-ssa-loop-ch.c: Remove TODO_dump_func.
+	* tree-tailcall.c: Remove TODO_dump_func.
+	* ipa-cp.c: Remove TODO_dump_func.
+	* final.c: Remove TODO_dump_func.
+	* tree-emutls.c: Remove TODO_dump_func.
+	* omp-low.c: Remove TODO_dump_func.
+	* tree-ssa-dse.c: Remove TODO_dump_func.
+	* tree-ssa-uncprop.c: Remove TODO_dump_func.
+	* auto-inc-dec.c: Remove TODO_dump_func.
+	* reorg.c: Remove TODO_dump_func.
+	* tree-ssa-copyrename.c: Remove TODO_dump_func.
+	* tree-ssa-ccp.c: Remove TODO_dump_func.
+	* compare-elim.c: Remove TODO_dump_func.
+	* mode-switching.c: Remove TODO_dump_func.
+	* modulo-sched.c: Remove TODO_dump_func.
+	* tree-call-cdce.c: Remove TODO_dump_func.
+	* cse.c: Remove TODO_dump_func.
+	* web.c: Remove TODO_dump_func.
+	* tree-stdarg.c: Remove TODO_dump_func.
+	* lto-streamer-out.c: Remove TODO_dump_func.
+	* tree-ssa-math-opts.c: Remove TODO_dump_func.
+	* tree-ssa-dom.c: Remove TODO_dump_func.
+	* tree-nrv.c: Remove TODO_dump_func.
+	* loop-init.c: Remove TODO_dump_func.
+	* gimple-low.c: Remove TODO_dump_func.
+	* ipa-inline.c: Remove TODO_dump_func.
+	* tree-ssa-sink.c: Remove TODO_dump_func.
+	* jump.c: Remove TODO_dump_func.
+	* ifcvt.c: Remove TODO_dump_func.
+	* tree-ssa-loop.c: Remove TODO_dump_func.
+	* recog.c: Remove TODO_dump_func.
+	* dse.c: Remove TODO_dump_func.
+	* tree-ssa-ifcombine.c: Remove TODO_dump_func.
+	* matrix-reorg.c: Remove TODO_dump_func.
+	* tree-eh.c: Remove TODO_dump_func.
+	* regmove.c: Remove TODO_dump_func.
+	* function.c: Remove TODO_dump_func.
+	* tree-vectorizer.c: Remove TODO_dump_func.
+	* ipa-split.c: Remove TODO_dump_func.
+	* gcse.c: Remove TODO_dump_func.
+	* tree-if-conv.c: Remove TODO_dump_func.
+	* init-regs.c: Remove TODO_dump_func.
+	* tree-ssa-phiopt.c: Remove TODO_dump_func.
+	* implicit-zee.c: Remove TODO_dump_func.
+	* lower-subreg.c: Remove TODO_dump_func.
+	* bt-load.c: Remove TODO_dump_func.
+	* tree-dfa.c: Remove TODO_dump_func.
+	* except.c: Remove TODO_dump_func.
+	* emit-rtl.c: Remove TODO_dump_func.
+	* store-motion.c: Remove TODO_dump_func.
+	* cfgexpand.c: Remove TODO_dump_func.
+	* tree-cfgcleanup.c: Remove TODO_dump_func.
+	* cfgcleanup.c: Remove TODO_dump_func.
+	* tree-ssa-pre.c: Remove TODO_dump_func.
+	* tree-sra.c: Remove TODO_dump_func.
+	* tree-mudflap.c: Remove TODO_dump_func.
+	* tree-ssa-copy.c: Remove TODO_dump_func.
+	* cfglayout.c: Remove TODO_dump_func.
+	* tree-ssa-forwprop.c: Remove TODO_dump_func.
+	* tree-ssa-dce.c: Remove TODO_dump_func.
+	* ira.c: Remove TODO_dump_func.
+	* tree-ssa.c: Remove TODO_dump_func.
+	* integrate.c: Remove TODO_dump_func.
+	* tree-optimize.c: Remove TODO_dump_func.
+	* tree-ssa-phiprop.c: Remove TODO_dump_func.
+	* tree-object-size.c: Remove TODO_dump_func.
+	* combine.c: Remove TODO_dump_func.
+	* bb-reorder.c: Remove TODO_dump_func.
+	* cprop.c: Remove TODO_dump_func.
+	* var-tracking.c: Remove TODO_dump_func.
+	* tree-profile.c: Remove TODO_dump_func.
+	* tree-vect-generic.c: Remove TODO_dump_func.
+	* reg-stack.c: Remove TODO_dump_func.
+	* sched-rgn.c: Remove TODO_dump_func.
+	* tree-ssa-structalias.c: Remove TODO_dump_func.
+	* tree-switch-conversion.c: Remove TODO_dump_func.
+	* tree-cfg.c: Remove TODO_dump_func.
+	* tree-ssa-reassoc.c: Remove TODO_dump_func.
+	* combine-stack-adj.c: Remove TODO_dump_func.
+	* dce.c: Remove TODO_dump_func.
+	* tree-ssanames.c: Remove TODO_dump_func.
+	* regcprop.c: Remove TODO_dump_func.
+
 2011-06-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR middle-end/47364
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index cb905428d92..dbd12e72f21 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.c
@@ -1523,7 +1523,6 @@ struct rtl_opt_pass pass_inc_dec =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_finish,                       /* todo_flags_finish */
  }
 };
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index e4996144761..6d2aedbb63a 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -2117,7 +2117,7 @@ struct rtl_opt_pass pass_duplicate_computed_gotos =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing,/* todo_flags_finish */
+  TODO_verify_rtl_sharing,/* todo_flags_finish */
  }
 };
 
@@ -2260,7 +2260,7 @@ struct rtl_opt_pass pass_reorder_blocks =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing,/* todo_flags_finish */
+  TODO_verify_rtl_sharing,              /* todo_flags_finish */
  }
 };
 
@@ -2300,6 +2300,6 @@ struct rtl_opt_pass pass_partition_blocks =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing/* todo_flags_finish */
+  TODO_verify_rtl_sharing               /* todo_flags_finish */
  }
 };
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index d8063d2e24e..d8aab567166 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -1519,7 +1519,6 @@ struct rtl_opt_pass pass_branch_target_load_optimize1 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_verify_rtl_sharing |
   TODO_ggc_collect,                     /* todo_flags_finish */
  }
@@ -1569,7 +1568,6 @@ struct rtl_opt_pass pass_branch_target_load_optimize2 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_ggc_collect,                     /* todo_flags_finish */
  }
 };
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index c36af89a137..f51e57f5b70 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -2989,8 +2989,6 @@ struct rtl_opt_pass pass_jump2 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   TODO_ggc_collect,                     /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing,/* todo_flags_finish */
+  TODO_verify_rtl_sharing,              /* todo_flags_finish */
  }
 };
-
-
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 491c2fc48cc..efd3ed93c36 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -4273,7 +4273,6 @@ struct rtl_opt_pass pass_expand =
   PROP_ssa | PROP_trees,		/* properties_destroyed */
   TODO_verify_ssa | TODO_verify_flow
     | TODO_verify_stmts,		/* todo_flags_start */
-  TODO_dump_func
-  | TODO_ggc_collect			/* todo_flags_finish */
+  TODO_ggc_collect			/* todo_flags_finish */
  }
 };
diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c
index 548e21f7f4f..02709d09a3c 100644
--- a/gcc/cfglayout.c
+++ b/gcc/cfglayout.c
@@ -378,7 +378,7 @@ struct rtl_opt_pass pass_into_cfg_layout_mode =
   PROP_cfglayout,                       /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func,                       /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -397,7 +397,7 @@ struct rtl_opt_pass pass_outof_cfg_layout_mode =
   0,                                    /* properties_provided */
   PROP_cfglayout,                       /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func,                       /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index 76c175cd552..d267b701f1f 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -584,7 +584,6 @@ struct rtl_opt_pass pass_stack_adjustments =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect,                     /* todo_flags_finish */
  }
 };
diff --git a/gcc/combine.c b/gcc/combine.c
index 5b68bab12d7..56fb44eaf42 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -13944,7 +13944,6 @@ struct rtl_opt_pass pass_combine =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_finish | TODO_verify_rtl_sharing |
   TODO_ggc_collect,                     /* todo_flags_finish */
  }
diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c
index c3eecfa280b..e5b2088292e 100644
--- a/gcc/compare-elim.c
+++ b/gcc/compare-elim.c
@@ -636,7 +636,6 @@ struct rtl_opt_pass pass_compare_elim_after_reload =
   TODO_df_finish
   | TODO_df_verify
   | TODO_verify_rtl_sharing
-  | TODO_dump_func
   | TODO_ggc_collect			/* todo_flags_finish */
  }
 };
diff --git a/gcc/cprop.c b/gcc/cprop.c
index b7b17b19387..83193b9d6b4 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -1878,8 +1878,6 @@ struct rtl_opt_pass pass_rtl_cprop =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_verify_flow | TODO_ggc_collect   /* todo_flags_finish */
  }
 };
-
diff --git a/gcc/cse.c b/gcc/cse.c
index 213b6083e7f..8a31cd1a3da 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -7424,7 +7424,6 @@ struct rtl_opt_pass pass_cse =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect |
   TODO_verify_flow,                     /* todo_flags_finish */
  }
@@ -7487,7 +7486,6 @@ struct rtl_opt_pass pass_cse2 =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect |
   TODO_verify_flow                      /* todo_flags_finish */
  }
@@ -7548,7 +7546,6 @@ struct rtl_opt_pass pass_cse_after_global_opts =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect |
   TODO_verify_flow                      /* todo_flags_finish */
  }
diff --git a/gcc/dce.c b/gcc/dce.c
index 997432501d3..ae2ff478597 100644
--- a/gcc/dce.c
+++ b/gcc/dce.c
@@ -786,7 +786,6 @@ struct rtl_opt_pass pass_ud_rtl_dce =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_finish | TODO_verify_rtl_sharing |
   TODO_ggc_collect                     /* todo_flags_finish */
  }
@@ -1138,7 +1137,6 @@ struct rtl_opt_pass pass_fast_rtl_dce =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_finish | TODO_verify_rtl_sharing |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
diff --git a/gcc/dse.c b/gcc/dse.c
index dee4c76d430..d099f04f6f5 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -3853,7 +3853,6 @@ struct rtl_opt_pass pass_rtl_dse1 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_finish | TODO_verify_rtl_sharing |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
@@ -3874,7 +3873,6 @@ struct rtl_opt_pass pass_rtl_dse2 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_finish | TODO_verify_rtl_sharing |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index f760a1bdc14..f010ac6f5ab 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -2413,7 +2413,7 @@ struct rtl_opt_pass pass_unshare_all_rtl =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing /* todo_flags_finish */
+  TODO_verify_rtl_sharing               /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/except.c b/gcc/except.c
index 1e5c291055f..c13ab5f820b 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1468,7 +1468,7 @@ struct rtl_opt_pass pass_rtl_eh =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -1910,7 +1910,7 @@ struct rtl_opt_pass pass_set_nothrow_function_flags =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func,                       /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -2665,7 +2665,7 @@ struct rtl_opt_pass pass_convert_to_eh_region_ranges =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func,			/* todo_flags_finish */
+  0              			/* todo_flags_finish */
  }
 };
 
diff --git a/gcc/final.c b/gcc/final.c
index 748042abf10..cb4a83d08ee 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -837,7 +837,7 @@ struct rtl_opt_pass pass_compute_alignments =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing
+  TODO_verify_rtl_sharing
   | TODO_ggc_collect                    /* todo_flags_finish */
  }
 };
@@ -4337,7 +4337,7 @@ struct rtl_opt_pass pass_shorten_branches =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/function.c b/gcc/function.c
index 30cc9ff2b4f..d5248730de1 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -1955,7 +1955,7 @@ struct rtl_opt_pass pass_instantiate_virtual_regs =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -5949,7 +5949,6 @@ struct rtl_opt_pass pass_thread_prologue_and_epilogue =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   TODO_verify_flow,                     /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_verify |
   TODO_df_finish | TODO_verify_rtl_sharing |
   TODO_ggc_collect                      /* todo_flags_finish */
@@ -6151,7 +6150,7 @@ struct rtl_opt_pass pass_match_asm_constraints =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index b2fd9556bbb..444a539cf79 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -1473,8 +1473,7 @@ struct rtl_opt_pass pass_rtl_fwprop =
   0,                                    /* todo_flags_start */
   TODO_df_finish
     | TODO_verify_flow
-    | TODO_verify_rtl_sharing
-    | TODO_dump_func                    /* todo_flags_finish */
+    | TODO_verify_rtl_sharing           /* todo_flags_finish */
  }
 };
 
@@ -1521,7 +1520,6 @@ struct rtl_opt_pass pass_rtl_fwprop_addr =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  TODO_df_finish | TODO_verify_rtl_sharing  /* todo_flags_finish */
  }
 };
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 41fff7ab86b..c371f827d22 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -3772,7 +3772,6 @@ struct rtl_opt_pass pass_rtl_pre =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_verify_flow | TODO_ggc_collect   /* todo_flags_finish */
  }
 };
@@ -3793,10 +3792,8 @@ struct rtl_opt_pass pass_rtl_hoist =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_verify_flow | TODO_ggc_collect   /* todo_flags_finish */
  }
 };
 
 #include "gt-gcse.h"
-
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index 3afa0b2582d..5c05f842c4c 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -203,7 +203,7 @@ struct gimple_opt_pass pass_lower_cf =
   PROP_gimple_lcf,			/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index b34aee27379..239f498cb8a 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -4368,7 +4368,7 @@ struct rtl_opt_pass pass_rtl_ifcvt =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -4405,7 +4405,6 @@ struct rtl_opt_pass pass_if_after_combine =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
@@ -4442,7 +4441,6 @@ struct rtl_opt_pass pass_if_after_reload =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
diff --git a/gcc/implicit-zee.c b/gcc/implicit-zee.c
index 2e4b58b4e48..db422482c90 100644
--- a/gcc/implicit-zee.c
+++ b/gcc/implicit-zee.c
@@ -988,7 +988,6 @@ struct rtl_opt_pass pass_implicit_zee =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_ggc_collect |
-  TODO_dump_func |
   TODO_verify_rtl_sharing,              /* todo_flags_finish */
  }
 };
diff --git a/gcc/init-regs.c b/gcc/init-regs.c
index b4dd5e9a1fb..594b6e6388b 100644
--- a/gcc/init-regs.c
+++ b/gcc/init-regs.c
@@ -153,7 +153,6 @@ struct rtl_opt_pass pass_initialize_regs =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_df_finish                        /* todo_flags_finish */
  }
 };
diff --git a/gcc/integrate.c b/gcc/integrate.c
index af103e5fece..3a79183b155 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -325,7 +325,7 @@ struct rtl_opt_pass pass_initial_value_sets =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index e9529552d16..a7fecf26fbf 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -1583,7 +1583,7 @@ struct ipa_opt_pass_d pass_ipa_cp =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_cgraph | TODO_dump_func |
+  TODO_dump_cgraph |
   TODO_remove_functions | TODO_ggc_collect /* todo_flags_finish */
  },
  ipcp_generate_summary,			/* generate_summary */
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index c9328c91053..ff1041ba493 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1964,7 +1964,7 @@ struct gimple_opt_pass pass_early_inline =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func    			/* todo_flags_finish */
+  0                 			/* todo_flags_finish */
  }
 };
 
@@ -1998,7 +1998,7 @@ struct ipa_opt_pass_d pass_ipa_inline =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   TODO_remove_functions,		/* todo_flags_finish */
-  TODO_dump_cgraph | TODO_dump_func
+  TODO_dump_cgraph 
   | TODO_remove_functions | TODO_ggc_collect	/* todo_flags_finish */
  },
  inline_generate_summary,		/* generate_summary */
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 2e672874024..7413d81aeee 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -1432,7 +1432,7 @@ struct gimple_opt_pass pass_split_functions =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -1473,6 +1473,6 @@ struct gimple_opt_pass pass_feedback_split_functions =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
diff --git a/gcc/ira.c b/gcc/ira.c
index 222d48eb1c4..5cfe5c0fa6b 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -3806,7 +3806,6 @@ struct rtl_opt_pass pass_ira =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
diff --git a/gcc/jump.c b/gcc/jump.c
index 1c64b85d408..f337eb3add0 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -156,7 +156,7 @@ struct rtl_opt_pass pass_cleanup_barriers =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index bd4af30c5c5..9184a148c40 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -158,7 +158,6 @@ struct rtl_opt_pass pass_loop2 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
@@ -192,7 +191,7 @@ struct rtl_opt_pass pass_rtl_loop_init =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing /* todo_flags_finish */
+  TODO_verify_rtl_sharing               /* todo_flags_finish */
  }
 };
 
@@ -228,8 +227,7 @@ struct rtl_opt_pass pass_rtl_loop_done =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_verify_flow
-    | TODO_verify_rtl_sharing
-    | TODO_dump_func                    /* todo_flags_finish */
+    | TODO_verify_rtl_sharing           /* todo_flags_finish */
  }
 };
 
@@ -265,8 +263,7 @@ struct rtl_opt_pass pass_rtl_move_loop_invariants =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_verify |
-  TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  TODO_df_finish | TODO_verify_rtl_sharing  /* todo_flags_finish */
  }
 };
 
@@ -301,7 +298,7 @@ struct rtl_opt_pass pass_rtl_unswitch =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing, /* todo_flags_finish */
+  TODO_verify_rtl_sharing,              /* todo_flags_finish */
  }
 };
 
@@ -349,7 +346,7 @@ struct rtl_opt_pass pass_rtl_unroll_and_peel_loops =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing, /* todo_flags_finish */
+  TODO_verify_rtl_sharing,              /* todo_flags_finish */
  }
 };
 
@@ -390,7 +387,6 @@ struct rtl_opt_pass pass_rtl_doloop =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing /* todo_flags_finish */
+  TODO_verify_rtl_sharing               /* todo_flags_finish */
  }
 };
-
diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c
index 2119c0902b3..85aa29891bf 100644
--- a/gcc/lower-subreg.c
+++ b/gcc/lower-subreg.c
@@ -1370,7 +1370,6 @@ struct rtl_opt_pass pass_lower_subreg =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_ggc_collect |
   TODO_verify_flow                      /* todo_flags_finish */
  }
@@ -1392,7 +1391,6 @@ struct rtl_opt_pass pass_lower_subreg2 =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect |
   TODO_verify_flow                      /* todo_flags_finish */
  }
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 17042d5c134..a28e857617d 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -2302,7 +2302,7 @@ struct ipa_opt_pass_d pass_ipa_lto_gimple_out =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,            			/* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  },
  NULL,		                        /* generate_summary */
  lto_output,           			/* write_summary */
diff --git a/gcc/matrix-reorg.c b/gcc/matrix-reorg.c
index 6f75d3320c1..dfc189632d5 100644
--- a/gcc/matrix-reorg.c
+++ b/gcc/matrix-reorg.c
@@ -2390,6 +2390,6 @@ struct simple_ipa_opt_pass pass_ipa_matrix_reorg =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_cgraph | TODO_dump_func	/* todo_flags_finish */
+  TODO_dump_cgraph      	/* todo_flags_finish */
  }
 };
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index d4c7b24b981..9b11842781c 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -772,6 +772,6 @@ struct rtl_opt_pass pass_mode_switching =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index 327c09aefed..6e284acb49f 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -2969,12 +2969,10 @@ struct rtl_opt_pass pass_sms =
   0,                                    /* properties_required */
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
-  TODO_dump_func,                       /* todo_flags_start */
+  0,                                    /* todo_flags_start */
   TODO_df_finish
     | TODO_verify_flow
     | TODO_verify_rtl_sharing
-    | TODO_dump_func
     | TODO_ggc_collect                  /* todo_flags_finish */
  }
 };
-
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index e4bf141b908..99dedf9369c 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -5553,7 +5553,7 @@ struct gimple_opt_pass pass_expand_omp =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0                      		/* todo_flags_finish */
  }
 };
 
@@ -6730,7 +6730,7 @@ struct gimple_opt_pass pass_lower_omp =
   PROP_gimple_lomp,			/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/passes.c b/gcc/passes.c
index 0faef10b590..23963a01e31 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -1602,6 +1602,37 @@ do_per_function_toporder (void (*callback) (void *data), void *data)
   nnodes = 0;
 }
 
+/* Helper function to perform function body dump.  */
+
+static void
+execute_function_dump (void *data ATTRIBUTE_UNUSED)
+{
+  if (dump_file && current_function_decl)
+    {
+      if (cfun->curr_properties & PROP_trees)
+        dump_function_to_file (current_function_decl, dump_file, dump_flags);
+      else
+	{
+	  if (dump_flags & TDF_SLIM)
+	    print_rtl_slim_with_bb (dump_file, get_insns (), dump_flags);
+	  else if ((cfun->curr_properties & PROP_cfg)
+		   && (dump_flags & TDF_BLOCKS))
+	    print_rtl_with_bb (dump_file, get_insns ());
+          else
+	    print_rtl (dump_file, get_insns ());
+
+	  if ((cfun->curr_properties & PROP_cfg)
+	      && graph_dump_format != no_graph
+	      && (dump_flags & TDF_GRAPH))
+	    print_rtl_graph_with_bb (dump_file_name, get_insns ());
+	}
+
+      /* Flush the file.  If verification fails, we won't be able to
+	 close the file before aborting.  */
+      fflush (dump_file);
+    }
+}
+
 /* Perform all TODO actions that ought to be done on each function.  */
 
 static void
@@ -1648,31 +1679,6 @@ execute_function_todo (void *data)
   if (flags & TODO_remove_unused_locals)
     remove_unused_locals ();
 
-  if ((flags & TODO_dump_func) && dump_file && current_function_decl)
-    {
-      if (cfun->curr_properties & PROP_trees)
-        dump_function_to_file (current_function_decl, dump_file, dump_flags);
-      else
-	{
-	  if (dump_flags & TDF_SLIM)
-	    print_rtl_slim_with_bb (dump_file, get_insns (), dump_flags);
-	  else if ((cfun->curr_properties & PROP_cfg)
-		   && (dump_flags & TDF_BLOCKS))
-	    print_rtl_with_bb (dump_file, get_insns ());
-          else
-	    print_rtl (dump_file, get_insns ());
-
-	  if ((cfun->curr_properties & PROP_cfg)
-	      && graph_dump_format != no_graph
-	      && (dump_flags & TDF_GRAPH))
-	    print_rtl_graph_with_bb (dump_file_name, get_insns ());
-	}
-
-      /* Flush the file.  If verification fails, we won't be able to
-	 close the file before aborting.  */
-      fflush (dump_file);
-    }
-
   if (flags & TODO_rebuild_frequencies)
     rebuild_frequencies ();
 
@@ -1898,6 +1904,7 @@ execute_one_ipa_transform_pass (struct cgraph_node *node,
   execute_todo (todo_after);
   verify_interpass_invariants ();
 
+  do_per_function (execute_function_dump, NULL);
   pass_fini_dump_file (pass);
 
   current_pass = NULL;
@@ -2038,6 +2045,7 @@ execute_one_pass (struct opt_pass *pass)
   /* Run post-pass cleanup and verification.  */
   execute_todo (todo_after | pass->todo_flags_finish);
   verify_interpass_invariants ();
+  do_per_function (execute_function_dump, NULL);
   if (pass->type == IPA_PASS)
     {
       struct cgraph_node *node;
diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c
index bc55ead744f..e05e4450d0e 100644
--- a/gcc/postreload-gcse.c
+++ b/gcc/postreload-gcse.c
@@ -1344,8 +1344,7 @@ struct rtl_opt_pass pass_gcse2 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing
+  TODO_verify_rtl_sharing
   | TODO_verify_flow | TODO_ggc_collect /* todo_flags_finish */
  }
 };
-
diff --git a/gcc/postreload.c b/gcc/postreload.c
index 0f3e5c24658..e5c6ce7cdbc 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -2287,6 +2287,6 @@ struct rtl_opt_pass pass_postreload_cse =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
diff --git a/gcc/recog.c b/gcc/recog.c
index afe985e2f27..0c26c0d90f0 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -3694,7 +3694,7 @@ struct rtl_opt_pass pass_peephole2 =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                       /* todo_flags_finish */
+  0                                    /* todo_flags_finish */
  }
 };
 
@@ -3720,7 +3720,7 @@ struct rtl_opt_pass pass_split_all_insns =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -3750,7 +3750,7 @@ struct rtl_opt_pass pass_split_after_reload =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -3794,7 +3794,7 @@ struct rtl_opt_pass pass_split_before_regstack =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -3832,8 +3832,7 @@ struct rtl_opt_pass pass_split_before_sched2 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_verify_flow |
-  TODO_dump_func                        /* todo_flags_finish */
+  TODO_verify_flow                      /* todo_flags_finish */
  }
 };
 
@@ -3864,6 +3863,6 @@ struct rtl_opt_pass pass_split_for_shorten_branches =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing /* todo_flags_finish */
+  TODO_verify_rtl_sharing               /* todo_flags_finish */
  }
 };
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index dcde8920d7e..896a68f3fc7 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -3352,7 +3352,6 @@ struct rtl_opt_pass pass_stack_regs_run =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
diff --git a/gcc/regcprop.c b/gcc/regcprop.c
index bf34115f1dc..911f59eb083 100644
--- a/gcc/regcprop.c
+++ b/gcc/regcprop.c
@@ -1188,7 +1188,7 @@ struct rtl_opt_pass pass_cprop_hardreg =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_df_finish
+  TODO_df_finish
   | TODO_verify_rtl_sharing		/* todo_flags_finish */
  }
 };
diff --git a/gcc/regmove.c b/gcc/regmove.c
index afa7ee7aa77..89dbd592103 100644
--- a/gcc/regmove.c
+++ b/gcc/regmove.c
@@ -1382,7 +1382,6 @@ struct rtl_opt_pass pass_regmove =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
diff --git a/gcc/regrename.c b/gcc/regrename.c
index c2292efba90..77e23f8c2ab 100644
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -1453,7 +1453,6 @@ struct rtl_opt_pass pass_regrename =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
-
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 443917df568..28b6c7d6271 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -4086,7 +4086,6 @@ struct rtl_opt_pass pass_delay_slots =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
@@ -4121,7 +4120,6 @@ struct rtl_opt_pass pass_machine_reorg =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
 };
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 248b870a75a..e510980816e 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -3551,7 +3551,6 @@ struct rtl_opt_pass pass_sched =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_verify_flow |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
@@ -3573,7 +3572,6 @@ struct rtl_opt_pass pass_sched2 =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_verify_flow |
   TODO_ggc_collect                      /* todo_flags_finish */
  }
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index f6a021eb778..c8beb24ed64 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -1258,8 +1258,6 @@ struct rtl_opt_pass pass_rtl_store_motion =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func |
   TODO_verify_flow | TODO_ggc_collect   /* todo_flags_finish */
  }
 };
-
diff --git a/gcc/tracer.c b/gcc/tracer.c
index 918ed784537..d3523b985b1 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -393,8 +393,7 @@ struct gimple_opt_pass pass_tracer =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func
-    | TODO_update_ssa
+  TODO_update_ssa
     | TODO_verify_ssa                   /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index 25476e61a09..8307edbce61 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -928,6 +928,6 @@ struct gimple_opt_pass pass_call_cdce =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa      /* todo_flags_finish */
+  TODO_verify_ssa                       /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 44b5c658374..349f56ecf74 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -261,8 +261,7 @@ struct gimple_opt_pass pass_build_cfg =
   PROP_cfg,				/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_verify_stmts | TODO_cleanup_cfg
-  | TODO_dump_func			/* todo_flags_finish */
+  TODO_verify_stmts | TODO_cleanup_cfg  /* todo_flags_finish */
  }
 };
 
@@ -7253,7 +7252,7 @@ struct gimple_opt_pass pass_split_crit_edges =
   PROP_no_crit_edges,            /* properties_provided */
   0,                             /* properties_destroyed */
   0,                             /* todo_flags_start */
-  TODO_dump_func | TODO_verify_flow  /* todo_flags_finish */
+  TODO_verify_flow               /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index ad8e4777a05..1036e1e98f3 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -1054,7 +1054,7 @@ struct gimple_opt_pass pass_merge_phi =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_func | TODO_ggc_collect	/* todo_flags_finish */
+  TODO_ggc_collect      	/* todo_flags_finish */
   | TODO_verify_ssa
  }
 };
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index ec2b438ca47..1b2a588ee2e 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.c
@@ -1623,8 +1623,7 @@ struct gimple_opt_pass pass_lower_complex =
   PROP_gimple_lcx,			/* properties_provided */
   0,                       		/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_ggc_collect
+    TODO_ggc_collect
     | TODO_update_ssa
     | TODO_verify_stmts	 		/* todo_flags_finish */
  }
@@ -1654,8 +1653,7 @@ struct gimple_opt_pass pass_lower_complex_O0 =
   PROP_gimple_lcx,			/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_ggc_collect
+  TODO_ggc_collect
     | TODO_update_ssa
     | TODO_verify_stmts	 		/* todo_flags_finish */
  }
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 9791bccecae..62d4bfe3fb8 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -113,8 +113,8 @@ struct gimple_opt_pass pass_referenced_vars =
   PROP_gimple_leh | PROP_cfg,		/* properties_required */
   PROP_referenced_vars,			/* properties_provided */
   0,					/* properties_destroyed */
-  TODO_dump_func,			/* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0,                     		/* todo_flags_start */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -1000,4 +1000,3 @@ stmt_references_abnormal_ssa_name (gimple stmt)
 
   return false;
 }
-
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index e87c32e798b..5831d34826c 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -2052,7 +2052,7 @@ struct gimple_opt_pass pass_lower_eh =
   PROP_gimple_leh,			/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -2865,7 +2865,7 @@ struct gimple_opt_pass pass_refactor_eh =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -3071,7 +3071,7 @@ struct gimple_opt_pass pass_lower_resx =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_flow	/* todo_flags_finish */
+  TODO_verify_flow	                /* todo_flags_finish */
  }
 };
 
@@ -3272,7 +3272,7 @@ struct gimple_opt_pass pass_lower_eh_dispatch =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_flow	/* todo_flags_finish */
+  TODO_verify_flow	                /* todo_flags_finish */
  }
 };
 
@@ -4015,7 +4015,7 @@ struct gimple_opt_pass pass_cleanup_eh = {
    0,				/* properties_provided */
    0,				/* properties_destroyed */
    0,				/* todo_flags_start */
-   TODO_dump_func		/* todo_flags_finish */
+   0             		/* todo_flags_finish */
    }
 };
 
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index 11240477b97..e1a1c1d56cc 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -783,7 +783,7 @@ ipa_lower_emutls (void)
   VEC_free (tree, heap, access_vars);
   free_varpool_node_set (tls_vars);
 
-  return TODO_dump_func | TODO_ggc_collect | TODO_verify_all;
+  return TODO_ggc_collect | TODO_verify_all;
 }
 
 /* If the target supports TLS natively, we need do nothing here.  */
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index bf1c8cdbc47..4fde3a37a48 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -1808,7 +1808,7 @@ struct gimple_opt_pass pass_if_conversion =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_stmts | TODO_verify_flow
+  TODO_verify_stmts | TODO_verify_flow
                                         /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 74386e44411..f138e5b72c9 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -2413,8 +2413,7 @@ struct gimple_opt_pass pass_build_ssa =
   PROP_ssa,				/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_update_ssa_only_virtuals
+  TODO_update_ssa_only_virtuals
     | TODO_verify_ssa
     | TODO_remove_unused_locals		/* todo_flags_finish */
  }
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 1d6944eef96..ae17755a9d6 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -1313,6 +1313,6 @@ struct gimple_opt_pass pass_loop_distribution =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_func                /* todo_flags_finish */
+  0                             /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c
index 40120b0dd4f..bcd77e27bd9 100644
--- a/gcc/tree-mudflap.c
+++ b/gcc/tree-mudflap.c
@@ -1389,7 +1389,7 @@ struct gimple_opt_pass pass_mudflap_1 =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0                                     /* todo_flags_finish */
  }
 };
 
@@ -1409,7 +1409,7 @@ struct gimple_opt_pass pass_mudflap_2 =
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_verify_flow | TODO_verify_stmts
-  | TODO_dump_func | TODO_update_ssa    /* todo_flags_finish */
+  | TODO_update_ssa                     /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 32e422e5e20..982fcc8fc11 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -288,7 +288,7 @@ struct gimple_opt_pass pass_nrv =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_ggc_collect			/* todo_flags_finish */
+  TODO_ggc_collect			/* todo_flags_finish */
  }
 };
 
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index 41118d25b2e..674f72e9031 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -1282,6 +1282,6 @@ struct gimple_opt_pass pass_object_sizes =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa	/* todo_flags_finish */
+  TODO_verify_ssa	                /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-optimize.c b/gcc/tree-optimize.c
index c46cf6c5458..411886cacb6 100644
--- a/gcc/tree-optimize.c
+++ b/gcc/tree-optimize.c
@@ -208,8 +208,7 @@ struct gimple_opt_pass pass_cleanup_cfg_post_optimizing =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
-    | TODO_remove_unused_locals
+  TODO_remove_unused_locals             /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 3bc4d5c532c..cd9b49d4304 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -591,7 +591,7 @@ struct simple_ipa_opt_pass pass_ipa_tree_profile =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  0                                    /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 8ad84beb655..c7f4174255d 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -3093,8 +3093,7 @@ struct gimple_opt_pass pass_sra_early =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-  | TODO_update_ssa
+  TODO_update_ssa
   | TODO_ggc_collect
   | TODO_verify_ssa			/* todo_flags_finish */
  }
@@ -3115,8 +3114,7 @@ struct gimple_opt_pass pass_sra =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   TODO_update_address_taken,		/* todo_flags_start */
-  TODO_dump_func
-  | TODO_update_ssa
+  TODO_update_ssa
   | TODO_ggc_collect
   | TODO_verify_ssa			/* todo_flags_finish */
  }
@@ -4589,8 +4587,6 @@ struct gimple_opt_pass pass_early_ipa_sra =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_dump_cgraph 	/* todo_flags_finish */
+  TODO_dump_cgraph              	/* todo_flags_finish */
  }
 };
-
-
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 2caec4c5679..11bfb767f4c 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -1953,7 +1953,7 @@ struct gimple_opt_pass pass_ccp =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa
+  TODO_verify_ssa
   | TODO_verify_stmts | TODO_ggc_collect/* todo_flags_finish */
  }
 };
@@ -2256,8 +2256,7 @@ struct gimple_opt_pass pass_fold_builtins =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_verify_ssa
+  TODO_verify_ssa
     | TODO_update_ssa			/* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index 211d7de23c4..4c6d9927bbd 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -848,7 +848,6 @@ struct gimple_opt_pass pass_copy_prop =
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
   TODO_cleanup_cfg
-    | TODO_dump_func
     | TODO_ggc_collect
     | TODO_verify_ssa
     | TODO_update_ssa			/* todo_flags_finish */
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index ae4fb5fba39..88a156bab76 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -399,6 +399,6 @@ struct gimple_opt_pass pass_rename_ssa_copies =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa      /* todo_flags_finish */
+  TODO_verify_ssa                       /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index b13ef59af49..6b778765e92 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -1527,7 +1527,7 @@ struct gimple_opt_pass pass_dce =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa	/* todo_flags_finish */
+  TODO_verify_ssa	                /* todo_flags_finish */
  }
 };
 
@@ -1546,7 +1546,7 @@ struct gimple_opt_pass pass_dce_loop =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa	/* todo_flags_finish */
+  TODO_verify_ssa	                /* todo_flags_finish */
  }
 };
 
@@ -1565,7 +1565,7 @@ struct gimple_opt_pass pass_cd_dce =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa
+  TODO_verify_ssa
   | TODO_verify_flow			/* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 2e9498efdcc..f41d7eca562 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -816,8 +816,7 @@ struct gimple_opt_pass pass_dominator =
   TODO_cleanup_cfg
     | TODO_update_ssa
     | TODO_verify_ssa
-    | TODO_verify_flow
-    | TODO_dump_func			/* todo_flags_finish */
+    | TODO_verify_flow			/* todo_flags_finish */
  }
 };
 
@@ -2969,7 +2968,6 @@ struct gimple_opt_pass pass_phi_only_cprop =
   0,		                        /* properties_destroyed */
   0,                                    /* todo_flags_start */
   TODO_cleanup_cfg
-    | TODO_dump_func
     | TODO_ggc_collect
     | TODO_verify_ssa
     | TODO_verify_stmts
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index 6d51dabced6..285d08c66c6 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -352,9 +352,7 @@ struct gimple_opt_pass pass_dse =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_func
-    | TODO_ggc_collect
+  TODO_ggc_collect
     | TODO_verify_ssa		/* todo_flags_finish */
  }
 };
-
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 77a6264d560..86f45021229 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -2437,10 +2437,8 @@ struct gimple_opt_pass pass_forwprop =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_func
-  | TODO_ggc_collect
+  TODO_ggc_collect
   | TODO_update_ssa
   | TODO_verify_ssa		/* todo_flags_finish */
  }
 };
-
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index 9063bfdcd55..459c60a3057 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -663,8 +663,7 @@ struct gimple_opt_pass pass_tree_ifcombine =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_func
-  | TODO_ggc_collect
+  TODO_ggc_collect
   | TODO_update_ssa
   | TODO_verify_ssa		/* todo_flags_finish */
  }
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index c58cb5f8bba..57e71b44c28 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -278,7 +278,6 @@ struct gimple_opt_pass pass_ch =
   0,					/* todo_flags_start */
   TODO_cleanup_cfg
     | TODO_verify_ssa
-    | TODO_verify_flow
-    | TODO_dump_func			/* todo_flags_finish */
+    | TODO_verify_flow			/* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index c7efc7c0f6e..1a9c2be7376 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -60,7 +60,7 @@ struct gimple_opt_pass pass_tree_loop =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   TODO_ggc_collect,			/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa | TODO_ggc_collect	/* todo_flags_finish */
+  TODO_verify_ssa | TODO_ggc_collect	/* todo_flags_finish */
  }
 };
 
@@ -95,7 +95,7 @@ struct gimple_opt_pass pass_tree_loop_init =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -131,7 +131,7 @@ struct gimple_opt_pass pass_lim =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -167,7 +167,7 @@ struct gimple_opt_pass pass_tree_unswitch =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_ggc_collect | TODO_dump_func 	/* todo_flags_finish */
+  TODO_ggc_collect                  	/* todo_flags_finish */
  }
 };
 
@@ -203,8 +203,7 @@ struct gimple_opt_pass pass_predcom =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_update_ssa_only_virtuals	/* todo_flags_finish */
+  TODO_update_ssa_only_virtuals 	/* todo_flags_finish */
  }
 };
 
@@ -240,7 +239,7 @@ struct gimple_opt_pass pass_vectorize =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa
+  TODO_update_ssa
     | TODO_ggc_collect			/* todo_flags_finish */
  }
 };
@@ -308,7 +307,7 @@ struct gimple_opt_pass pass_graphite_transforms =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -345,7 +344,7 @@ struct gimple_opt_pass pass_check_data_deps =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func                	/* todo_flags_finish */
+  0                             	/* todo_flags_finish */
  }
 };
 
@@ -381,7 +380,7 @@ struct gimple_opt_pass pass_iv_canon =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -408,7 +407,7 @@ struct gimple_opt_pass pass_scev_cprop =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_cleanup_cfg
+  TODO_cleanup_cfg
     | TODO_update_ssa_only_virtuals
 					/* todo_flags_finish */
  }
@@ -480,8 +479,7 @@ struct gimple_opt_pass pass_complete_unroll =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_ggc_collect			/* todo_flags_finish */
+  TODO_ggc_collect			/* todo_flags_finish */
  }
 };
 
@@ -528,7 +526,6 @@ struct gimple_opt_pass pass_complete_unrolli =
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
   TODO_verify_flow
-    | TODO_dump_func
     | TODO_ggc_collect 			/* todo_flags_finish */
  }
 };
@@ -567,7 +564,7 @@ struct gimple_opt_pass pass_parallelize_loops =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -603,7 +600,7 @@ struct gimple_opt_pass pass_loop_prefetch =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
 
@@ -640,7 +637,7 @@ struct gimple_opt_pass pass_iv_optimize =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa | TODO_ggc_collect	/* todo_flags_finish */
+  TODO_update_ssa | TODO_ggc_collect	/* todo_flags_finish */
  }
 };
 
@@ -671,7 +668,6 @@ struct gimple_opt_pass pass_tree_loop_done =
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
   TODO_cleanup_cfg
-    | TODO_verify_flow
-    | TODO_dump_func			/* todo_flags_finish */
+    | TODO_verify_flow			/* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index bffd7f26c43..bc7919a39ad 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -645,7 +645,7 @@ struct gimple_opt_pass pass_cse_reciprocals =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa | TODO_verify_ssa
+  TODO_update_ssa | TODO_verify_ssa
     | TODO_verify_stmts                /* todo_flags_finish */
  }
 };
@@ -1491,7 +1491,7 @@ struct gimple_opt_pass pass_cse_sincos =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa | TODO_verify_ssa
+  TODO_update_ssa | TODO_verify_ssa
     | TODO_verify_stmts                 /* todo_flags_finish */
  }
 };
@@ -1918,7 +1918,7 @@ execute_optimize_bswap (void)
   statistics_counter_event (cfun, "64-bit bswap implementations found",
 			    bswap_stats.found_64bit);
 
-  return (changed ? TODO_dump_func | TODO_update_ssa | TODO_verify_ssa
+  return (changed ? TODO_update_ssa | TODO_verify_ssa
 	  | TODO_verify_stmts : 0);
 }
 
@@ -2471,7 +2471,6 @@ struct gimple_opt_pass pass_optimize_widening_mul =
   0,					/* todo_flags_start */
   TODO_verify_ssa
   | TODO_verify_stmts
-  | TODO_dump_func
   | TODO_update_ssa                     /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 6b15ae09488..79e8e015fda 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -1588,8 +1588,7 @@ struct gimple_opt_pass pass_phiopt =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_ggc_collect
+  TODO_ggc_collect
     | TODO_verify_ssa
     | TODO_verify_flow
     | TODO_verify_stmts	 		/* todo_flags_finish */
@@ -1617,8 +1616,7 @@ struct gimple_opt_pass pass_cselim =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func
-    | TODO_ggc_collect
+  TODO_ggc_collect
     | TODO_verify_ssa
     | TODO_verify_flow
     | TODO_verify_stmts	 		/* todo_flags_finish */
diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index a38e6962f95..30644372564 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -426,8 +426,7 @@ struct gimple_opt_pass pass_phiprop =
   0,				/* properties_provided */
   0,				/* properties_destroyed */
   0,				/* todo_flags_start */
-  TODO_dump_func
-  | TODO_ggc_collect
+  TODO_ggc_collect
   | TODO_update_ssa
   | TODO_verify_ssa		/* todo_flags_finish */
  }
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 27e84c22c5c..7c54d2a074f 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -4978,7 +4978,7 @@ struct gimple_opt_pass pass_pre =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   TODO_rebuild_alias,			/* todo_flags_start */
-  TODO_update_ssa_only_virtuals | TODO_dump_func | TODO_ggc_collect
+  TODO_update_ssa_only_virtuals  | TODO_ggc_collect
   | TODO_verify_ssa /* todo_flags_finish */
  }
 };
@@ -5013,6 +5013,6 @@ struct gimple_opt_pass pass_fre =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_ggc_collect | TODO_verify_ssa /* todo_flags_finish */
+  TODO_ggc_collect | TODO_verify_ssa /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 987ec650778..d8f9e2ecf61 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -2299,8 +2299,6 @@ struct gimple_opt_pass pass_reassoc =
   0,					/* todo_flags_start */
   TODO_verify_ssa
     | TODO_verify_flow
-    | TODO_dump_func
     | TODO_ggc_collect			/* todo_flags_finish */
  }
 };
-
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index 4dc5ae44a27..5107238093d 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -639,7 +639,6 @@ struct gimple_opt_pass pass_sink_code =
   TODO_update_ssa
     | TODO_verify_ssa
     | TODO_verify_flow
-    | TODO_dump_func
     | TODO_ggc_collect			/* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 3544cafa20c..d5516e673fa 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -6634,7 +6634,7 @@ struct gimple_opt_pass pass_build_alias =
   0,			    /* properties_provided */
   0,                        /* properties_destroyed */
   0,                        /* todo_flags_start */
-  TODO_rebuild_alias | TODO_dump_func  /* todo_flags_finish */
+  TODO_rebuild_alias        /* todo_flags_finish */
  }
 };
 
@@ -6656,7 +6656,7 @@ struct gimple_opt_pass pass_build_ealias =
   0,			    /* properties_provided */
   0,                        /* properties_destroyed */
   0,                        /* todo_flags_start */
-  TODO_rebuild_alias | TODO_dump_func  /* todo_flags_finish */
+  TODO_rebuild_alias        /* todo_flags_finish */
  }
 };
 
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index 30aa4c7755d..6f603ffc895 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.c
@@ -596,7 +596,6 @@ struct gimple_opt_pass pass_uncprop =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa	/* todo_flags_finish */
+  TODO_verify_ssa	                /* todo_flags_finish */
  }
 };
-
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index f0bbf3b9823..e4d931f862a 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -2277,7 +2277,6 @@ struct gimple_opt_pass pass_update_address_taken =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_update_address_taken
-  | TODO_dump_func			/* todo_flags_finish */
+  TODO_update_address_taken             /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index 06cdbee2c60..42eb9243252 100644
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -366,6 +366,6 @@ struct gimple_opt_pass pass_release_ssa_names =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func 			/* todo_flags_finish */
+  0              			/* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 46fc339a55a..3e890163d01 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -963,6 +963,6 @@ struct gimple_opt_pass pass_stdarg =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func			/* todo_flags_finish */
+  0             			/* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index c7a6f817ea5..4fb3e8a6971 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -1028,7 +1028,7 @@ struct gimple_opt_pass pass_convert_switch =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_update_ssa | TODO_dump_func
+  TODO_update_ssa 
   | TODO_ggc_collect | TODO_verify_ssa  /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 6a2308028bb..39a9067101e 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -1092,7 +1092,7 @@ struct gimple_opt_pass pass_tail_recursion =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa	/* todo_flags_finish */
+  TODO_verify_ssa	                /* todo_flags_finish */
  }
 };
 
@@ -1111,6 +1111,6 @@ struct gimple_opt_pass pass_tail_calls =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_verify_ssa	/* todo_flags_finish */
+  TODO_verify_ssa	                /* todo_flags_finish */
  }
 };
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index 41e21b4dd05..afcd63de88e 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.c
@@ -658,7 +658,7 @@ struct gimple_opt_pass pass_lower_vector =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa	/* todo_flags_finish */
+  TODO_update_ssa	                /* todo_flags_finish */
     | TODO_verify_ssa
     | TODO_verify_stmts | TODO_verify_flow
  }
@@ -679,7 +679,7 @@ struct gimple_opt_pass pass_lower_vector_ssa =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa	/* todo_flags_finish */
+  TODO_update_ssa	                /* todo_flags_finish */
     | TODO_verify_ssa
     | TODO_verify_stmts | TODO_verify_flow
  }
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index ed73deef66c..77fb0344ad5 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -292,7 +292,6 @@ struct gimple_opt_pass pass_slp_vectorize =
   0,                                    /* todo_flags_start */
   TODO_ggc_collect
     | TODO_verify_ssa
-    | TODO_dump_func
     | TODO_update_ssa
     | TODO_verify_stmts                 /* todo_flags_finish */
  }
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 0ca27eff6e6..d12d634221c 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -7816,7 +7816,6 @@ struct gimple_opt_pass pass_vrp =
     | TODO_update_ssa
     | TODO_verify_ssa
     | TODO_verify_flow
-    | TODO_dump_func
     | TODO_ggc_collect			/* todo_flags_finish */
  }
 };
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 0ddc8d7619e..1828d1f7e25 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -9131,6 +9131,6 @@ struct rtl_opt_pass pass_variable_tracking =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func | TODO_verify_rtl_sharing/* todo_flags_finish */
+  TODO_verify_rtl_sharing               /* todo_flags_finish */
  }
 };
diff --git a/gcc/web.c b/gcc/web.c
index e57bb37570f..c8f43459952 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -433,8 +433,6 @@ struct rtl_opt_pass pass_web =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_df_finish | TODO_verify_rtl_sharing |
-  TODO_dump_func                        /* todo_flags_finish */
+  TODO_df_finish | TODO_verify_rtl_sharing  /* todo_flags_finish */
  }
 };
-