fold-const.c (fold_binary_loc): Move ~X | X folding ...

[gcc.git] / gcc / domwalk.h

diff --git a/gcc/domwalk.h b/gcc/domwalk.h
index b034a85fe41da3a29f1767c36270975d2461d680..71a7c47b00aa0d5a7cb8fa8ce6cdfaf0d9ce444b 100644 (file)
--- a/gcc/domwalk.h
+++ b/gcc/domwalk.h
@@ -1,6 +1,5 @@
 /* Generic dominator tree walker
-   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 2003-2015 Free Software Foundation, Inc.
    Contributed by Diego Novillo <dnovillo@redhat.com>
 
 This file is part of GCC.
@@ -19,57 +18,35 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-typedef void *void_p;
+#ifndef GCC_DOM_WALK_H
+#define GCC_DOM_WALK_H
 
-/* This is the main data structure for the dominator walker.  It provides
-   the callback hooks as well as a convenient place to hang block local
-   data and pass-global data.  */
-
-struct dom_walk_data
+/**
+ * This is the main class for the dominator walker. It is expected that
+ * consumers will have a custom class inheriting from it, which will over ride
+ * at least one of before_dom_children and after_dom_children to implement the
+ * custom behavior.
+ */
+class dom_walker
 {
-  /* This is the direction of the dominator tree we want to walk.  i.e.,
-     if it is set to CDI_DOMINATORS, then we walk the dominator tree,
-     if it is set to CDI_POST_DOMINATORS, then we walk the post
-     dominator tree.  */
-  ENUM_BITFIELD (cdi_direction) dom_direction : 2;
-
-  /* Function to initialize block local data.
+public:
+  dom_walker (cdi_direction direction) : m_dom_direction (direction) {}
 
-     Note that the dominator walker infrastructure may provide a new
-     fresh, and zero'd block local data structure, or it may re-use an
-     existing block local data structure.
-
-     If the block local structure has items such as virtual arrays, then
-     that allows your optimizer to re-use those arrays rather than
-     creating new ones.  */
-  void (*initialize_block_local_data) (struct dom_walk_data *,
-                                      basic_block, bool);
+  /* Walk the dominator tree.  */
+  void walk (basic_block);
 
   /* Function to call before the recursive walk of the dominator children.  */
-  void (*before_dom_children) (struct dom_walk_data *, basic_block);
+  virtual void before_dom_children (basic_block) {}
 
   /* Function to call after the recursive walk of the dominator children.  */
-  void (*after_dom_children) (struct dom_walk_data *, basic_block);
-
-  /* Global data for a walk through the dominator tree.  */
-  void *global_data;
+  virtual void after_dom_children (basic_block) {}
 
-  /* Stack of any data we need to keep on a per-block basis.
-
-     If you have no local data, then BLOCK_DATA_STACK will be NULL.  */
-  vec<void_p> block_data_stack;
-
-  /* Size of the block local data.   If this is zero, then it is assumed
-     you have no local data and thus no BLOCK_DATA_STACK as well.  */
-  size_t block_local_data_size;
-
-  /* From here below are private data.  Please do not use this
-     information/data outside domwalk.c.  */
-
-  /* Stack of available block local structures.  */
-  vec<void_p> free_block_data;
+private:
+  /* This is the direction of the dominator tree we want to walk.  i.e.,
+     if it is set to CDI_DOMINATORS, then we walk the dominator tree,
+     if it is set to CDI_POST_DOMINATORS, then we walk the post
+     dominator tree.  */
+  const ENUM_BITFIELD (cdi_direction) m_dom_direction : 2;
 };
 
-void walk_dominator_tree (struct dom_walk_data *, basic_block);
-void init_walk_dominator_tree (struct dom_walk_data *);
-void fini_walk_dominator_tree (struct dom_walk_data *);
+#endif