* compare-elim.c (find_comparison_dom_walker): New class

	(find_comparisons_in_bb): Rename to
	find_comparison_dom_walker::before_dom_children
	(find_comparisons): Adjust
	* domwalk.c (walk_dominator_tree): Rename to dom_walker::walk, and
	adjust.
	(init_walk_dominator_tree, fini_walk_dominator_tree): Remove
	* domwalk.h (dom_walk_data): Convert it To a class dom_walker.
	(init_walk_dominator_tree): Remove declaration.
	(fini_walk_dominator_tree): Remove declaration.
	* fwprop.c (single_def_use_dom_walker): New class
	(single_def_use_enter_block): Convert to
	single_def_use_dom_walker::before_dom_children.
	(single_def_use_leave_block): Convert to
	single_def_use_dom_walker::after_dom_children.
	(build_single_def_use_links): Adjust.
	* gimple-ssa-strength-reduction.c (find_candidates_dom_walker): New
	class.
	(find_candidates_in_block): Convert to
	find_candidates_dom_walker::before_dom_children.
	(execute_strength_reduction): Adjust.
	* graphite-sese-to-poly.c (struct bsc, build_sese_conditions): Remove.
	(sese_dom_walker): New class.
	(sese_dom_walker::sese_dom_walker): New constructor.
	(sese_dom_walker::~sese_dom_walker): New destructor.
	(build_sese_conditions_before): Convert to
	sese_dom_walker::before_dom_children.
	(build_sese_conditions_after): Convert to
	sese_dom_walker::after_dom_children.
	(build_poly_scop): Adjust
	* tree-into-ssa.c (rewrite_dom_walker): New class
	(rewrite_enter_block): Convert to
	rewrite_dom_walker::before_dom_children.
	(rewrite_leave_block): Convert to
	rewrite_dom_walker::after_dom_children.
	(rewrite_update_dom_walker): New class.
	(rewrite_update_enter_block): Convert to
	rewrite_update_dom_walker::before_dom_children.
	(rewrite_update_leave_block): Convert to
	rewrite_update_dom_walker::after_dom_children.
	(rewrite_blocks, rewrite_into_ssa): Adjust.
	(mark_def_dom_walker): New class.
	(mark_def_dom_walker::mark_def_dom_walker): New constructor.
	(mark_def_dom_walker::~mark_def_dom_walker): New destructor.
	(mark_def_sites_blocks): Convert to
	mark_def_dom_walker::before_dom_children.
	(mark_def_site_blocks): Remove.
	* tree-ssa-dom.c (dom_opt_dom_walker): New class.
	(tree_ssa_dominator_optimize): Adjust.
	(dom_thread_across_edge): Convert to method
	dom_opt_dom_walker::thread_across_edge.
	(dom_opt_enter_block): Convert to member function
	dom_opt_dom_walker::before_dom_children.
	(dom_opt_leave_block): Convert to member function
	dom_opt_dom_walker::after_dom_children.
	* tree-ssa-dse.c (dse_dom_walker): New class.
	(dse_enter_block): Convert to member function
	dse_dom_walker::before_dom_children.
	(tree_ssa_dse): Adjust.
	* tree-ssa-loop-im.c (invariantness_dom_walker): New class.
	(determine_invariantness_stmt): Convert to method
	invariantness_dom_walker::before_dom_children.
	(determine_invariantness): Remove
	(move_computations_dom_walker): New class.
	(move_computations_stmt): Convert to method
	move_computations_dom_walker::before_dom_children.
	(move_computations, tree_ssa_lim): Adjust.
	* tree-ssa-phiopt.c (nontrapping_dom_walker): new class
	(nt_init_block): Make method
	notrappping_dom_walker::before_dom_children.
	(nt_fini_block): Make
	method nontrapping_dom_walker::after_dom_children.
	(get_non_trapping): Adjust.
	* tree-ssa-pre.c (eliminate_dom_walker): New class.
	(eliminate_bb): Make method eliminate_dom_walker::before_dom_children.
	(eliminate_leave_block): Make method.
	eliminate_dom_walker::after_dom_children.
	(eliminate): Adjust
	* tree-ssa-strlen.c (strlen_dom_walker): New class.
	(strlen_enter_block): Make method
	strlen_dom_walker::before_dom_children.
	(strlen_leave_block): Make
	method strlen_dom_walker::after_dom_children.
	(tree_ssa_strlen): Adjust.
	* tree-ssa-uncprop.c (uncprop_dom_walker): New class.
	(tree_ssa_uncprop): Adjust.
	(uncprop_leave_block): Make method
	uncprop_dom_walker::after_dom_children.
	(uncprop_leave_block): Make method
	uncprop_dom_walker::before_dom_children.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202679 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 14 insertions, 23 deletions

diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 8d6126764e4..c30ab33ef28 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -1926,12 +1926,20 @@ do_invalidate (basic_block dombb, gimple phi, bitmap visited, int *count)
     }
 }
 
+class strlen_dom_walker : public dom_walker
+{
+public:
+  strlen_dom_walker (cdi_direction direction) : dom_walker (direction) {}
+
+  virtual void before_dom_children (basic_block);
+  virtual void after_dom_children (basic_block);
+};
+
 /* Callback for walk_dominator_tree.  Attempt to optimize various
    string ops by remembering string lenths pointed by pointer SSA_NAMEs.  */
 
-static void
-strlen_enter_block (struct dom_walk_data *walk_data ATTRIBUTE_UNUSED,
-		    basic_block bb)
+void
+strlen_dom_walker::before_dom_children (basic_block bb)
 {
   gimple_stmt_iterator gsi;
   basic_block dombb = get_immediate_dominator (CDI_DOMINATORS, bb);
@@ -2014,9 +2022,8 @@ strlen_enter_block (struct dom_walk_data *walk_data ATTRIBUTE_UNUSED,
 /* Callback for walk_dominator_tree.  Free strinfo vector if it is
    owned by the current bb, clear bb->aux.  */
 
-static void
-strlen_leave_block (struct dom_walk_data *walk_data ATTRIBUTE_UNUSED,
-		    basic_block bb)
+void
+strlen_dom_walker::after_dom_children (basic_block bb)
 {
   if (bb->aux)
     {
@@ -2040,8 +2047,6 @@ strlen_leave_block (struct dom_walk_data *walk_data ATTRIBUTE_UNUSED,
 static unsigned int
 tree_ssa_strlen (void)
 {
-  struct dom_walk_data walk_data;
-
   ssa_ver_to_stridx.safe_grow_cleared (num_ssa_names);
   max_stridx = 1;
   strinfo_pool = create_alloc_pool ("strinfo_struct pool",
@@ -2051,21 +2056,7 @@ tree_ssa_strlen (void)
 
   /* String length optimization is implemented as a walk of the dominator
      tree and a forward walk of statements within each block.  */
-  walk_data.dom_direction = CDI_DOMINATORS;
-  walk_data.initialize_block_local_data = NULL;
-  walk_data.before_dom_children = strlen_enter_block;
-  walk_data.after_dom_children = strlen_leave_block;
-  walk_data.block_local_data_size = 0;
-  walk_data.global_data = NULL;
-
-  /* Initialize the dominator walker.  */
-  init_walk_dominator_tree (&walk_data);
-
-  /* Recursively walk the dominator tree.  */
-  walk_dominator_tree (&walk_data, ENTRY_BLOCK_PTR);
-
-  /* Finalize the dominator walker.  */
-  fini_walk_dominator_tree (&walk_data);
+  strlen_dom_walker (CDI_DOMINATORS).walk (cfun->cfg->x_entry_block_ptr);
 
   ssa_ver_to_stridx.release ();
   free_alloc_pool (strinfo_pool);