tree-pass.h, [...]: Revert last change.

        * tree-pass.h, tree-flow.h, tree-ssa-dce.c: Revert last change.
        * tree-ssa-loop.c (pass_vect_dce): Remove.
        * passes.c (init_optimization_passes): Add pass_dce as a sub-pass
        of pass_vectorize.

From-SVN: r104382

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b32d3c08d984082c7ac07e843f0818e81b4369b3..20db797d9e01d3e71b56d5b7c38501d1368d9117 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-17  Richard Henderson  <rth@redhat.com>
+
+       * tree-pass.h, tree-flow.h, tree-ssa-dce.c: Revert last change.
+       * tree-ssa-loop.c (pass_vect_dce): Remove.
+       * passes.c (init_optimization_passes): Add pass_dce as a sub-pass
+       of pass_vectorize.
+
 2005-09-17  Richard Henderson  <rth@redhat.com>
 
        * tree-pass.h (pass_vect_dce): Declare.

diff --git a/gcc/passes.c b/gcc/passes.c
index bf6db2cda737857176b3da3b650622c62da792a0..6a35b1750a7cbe14e62c320f0b15c6aa049a40c4 100644 (file)
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -567,7 +567,6 @@ init_optimization_passes (void)
   NEXT_PASS (pass_iv_canon);
   NEXT_PASS (pass_if_conversion);
   NEXT_PASS (pass_vectorize);
-  NEXT_PASS (pass_vect_dce);
   /* NEXT_PASS (pass_may_alias) cannot be done again because the
      vectorizer creates alias relations that are not supported by
      pass_may_alias.  */
@@ -577,6 +576,10 @@ init_optimization_passes (void)
   NEXT_PASS (pass_tree_loop_done);
   *p = NULL;
 
+  p = &pass_vectorize.sub;
+  NEXT_PASS (pass_dce);
+  *p = NULL;
+
   p = &pass_loop2.sub;
   NEXT_PASS (pass_rtl_loop_init);
   NEXT_PASS (pass_rtl_move_loop_invariants);

diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index ee53971667823bb5b178270d8c9bcb66ee38badb..fa5c1d692df115cb36322bfe80e4d811b8996f61 100644 (file)
--- a/gcc/tree-flow.h
+++ b/gcc/tree-flow.h
@@ -707,9 +707,6 @@ struct tree_niter_desc
                           the loop), then the information would be lost.  */
 };
 
-/* In tree-ssa-dce.c */
-void tree_ssa_dce (void);
-
 /* In tree-vectorizer.c */
 void vectorize_loops (struct loops *);
 

diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h
index cca51d3d6a39d1020ead8262958d0fbd95277dfa..57dc029438eeea05da849250a3cebb600819dc22 100644 (file)
--- a/gcc/tree-pass.h
+++ b/gcc/tree-pass.h
@@ -234,7 +234,6 @@ extern struct tree_opt_pass pass_empty_loop;
 extern struct tree_opt_pass pass_record_bounds;
 extern struct tree_opt_pass pass_if_conversion;
 extern struct tree_opt_pass pass_vectorize;
-extern struct tree_opt_pass pass_vect_dce;
 extern struct tree_opt_pass pass_complete_unroll;
 extern struct tree_opt_pass pass_iv_optimize;
 extern struct tree_opt_pass pass_tree_loop_done;

diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index e77bc6008a34491b4e0112e169e0eb3435d857d5..8902d2a2e0a398153013feaeb998018ce42a6f17 100644 (file)
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -935,7 +935,7 @@ perform_tree_ssa_dce (bool aggressive)
 }
 
 /* Pass entry points.  */
-void
+static void
 tree_ssa_dce (void)
 {
   perform_tree_ssa_dce (/*aggressive=*/false);

diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index ce629726e7957907fde23bf9b7d53d0e3b64f1e8..34126b16fa0401ef6b560f7921b64a6b9ff1d6ed 100644 (file)
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -214,27 +214,6 @@ struct tree_opt_pass pass_vectorize =
   0                                    /* letter */
 };
 
-struct tree_opt_pass pass_vect_dce =
-{
-  "vect_dce",                          /* name */
-  gate_tree_vectorize,                 /* gate */
-  tree_ssa_dce,                                /* execute */
-  NULL,                                        /* sub */
-  NULL,                                        /* next */
-  0,                                   /* static_pass_number */
-  TV_TREE_DCE,                         /* tv_id */
-  PROP_cfg | PROP_ssa | PROP_alias,    /* properties_required */
-  0,                                   /* properties_provided */
-  0,                                   /* properties_destroyed */
-  0,                                   /* todo_flags_start */
-  TODO_dump_func 
-    | TODO_update_ssa_no_phi 
-    | TODO_cleanup_cfg
-    | TODO_ggc_collect
-    | TODO_verify_ssa,                 /* todo_flags_finish */
-  0                                    /* letter */
-};
-
 /* Loop nest optimizations.  */
 
 static void