Various fixes to allow us to again build if --enable-mapped-location:

[pf3gnuchains/gcc-fork.git] / gcc / tree-ssa-loop.c

diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index 3ea6eed..e5ec3f3 100644 (file)
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -89,7 +89,8 @@ struct tree_opt_pass pass_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_dump_func | TODO_verify_ssa | TODO_ggc_collect, /* todo_flags_finish */
+  0                                    /* letter */
 };
 
 /* Loop optimizer initialization.  */
@@ -115,12 +116,13 @@ struct tree_opt_pass pass_loop_init =
   NULL,                                        /* sub */
   NULL,                                        /* next */
   0,                                   /* static_pass_number */
-  0,                                   /* tv_id */
+  TV_TREE_LOOP_INIT,                   /* tv_id */
   PROP_cfg,                            /* properties_required */
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */
 };
 
 /* Loop invariant motion pass.  */
@@ -153,7 +155,42 @@ struct tree_opt_pass pass_lim =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */
+};
+
+/* Loop unswitching pass.  */
+
+static void
+tree_ssa_loop_unswitch (void)
+{
+  if (!current_loops)
+    return;
+
+  tree_ssa_unswitch_loops (current_loops);
+}
+
+static bool
+gate_tree_ssa_loop_unswitch (void)
+{
+  return flag_unswitch_loops != 0;
+}
+
+struct tree_opt_pass pass_unswitch = 
+{
+  "unswitch",                          /* name */
+  gate_tree_ssa_loop_unswitch,         /* gate */
+  tree_ssa_loop_unswitch,              /* execute */
+  NULL,                                        /* sub */
+  NULL,                                        /* next */
+  0,                                   /* static_pass_number */
+  TV_TREE_LOOP_UNSWITCH,               /* tv_id */
+  PROP_cfg,                            /* properties_required */
+  0,                                   /* properties_provided */
+  0,                                   /* properties_destroyed */
+  0,                                   /* todo_flags_start */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */
 };
 
 /* Loop autovectorization.  */
@@ -187,7 +224,43 @@ struct tree_opt_pass pass_vectorize =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */
+};
+
+
+/* Loop nest optimizations.  */
+
+static void
+tree_linear_transform (void)
+{
+  if (!current_loops)
+    return;
+
+  linear_transform_loops (current_loops);
+}
+
+static bool
+gate_tree_linear_transform (void)
+{
+  return flag_tree_loop_linear != 0;
+}
+
+struct tree_opt_pass pass_linear_transform =
+{
+  "ltrans",                            /* name */
+  gate_tree_linear_transform,          /* gate */
+  tree_linear_transform,                       /* execute */
+  NULL,                                        /* sub */
+  NULL,                                        /* next */
+  0,                                   /* static_pass_number */
+  TV_TREE_LINEAR_TRANSFORM,            /* tv_id */
+  PROP_cfg | PROP_ssa,                 /* properties_required */
+  0,                                   /* properties_provided */
+  0,                                   /* properties_destroyed */
+  0,                                   /* todo_flags_start */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */    
 };
 
 /* Canonical induction variable creation pass.  */
@@ -220,7 +293,37 @@ struct tree_opt_pass pass_iv_canon =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */
+};
+
+/* Record bounds on numbers of iterations of loops.  */
+
+static void
+tree_ssa_loop_bounds (void)
+{
+  if (!current_loops)
+    return;
+
+  estimate_numbers_of_iterations (current_loops);
+  scev_reset ();
+}
+
+struct tree_opt_pass pass_record_bounds =
+{
+  NULL,                                        /* name */
+  NULL,                                        /* gate */
+  tree_ssa_loop_bounds,                        /* execute */
+  NULL,                                        /* sub */
+  NULL,                                        /* next */
+  0,                                   /* static_pass_number */
+  TV_TREE_LOOP_BOUNDS,                 /* tv_id */
+  PROP_cfg | PROP_ssa,                 /* properties_required */
+  0,                                   /* properties_provided */
+  0,                                   /* properties_destroyed */
+  0,                                   /* todo_flags_start */
+  0,                                   /* todo_flags_finish */
+  0                                    /* letter */
 };
 
 /* Complete unrolling of loops.  */
@@ -253,7 +356,42 @@ struct tree_opt_pass pass_complete_unroll =
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */
+};
+
+/* Induction variable optimizations.  */
+
+static void
+tree_ssa_loop_ivopts (void)
+{
+  if (!current_loops)
+    return;
+
+  tree_ssa_iv_optimize (current_loops);
+}
+
+static bool
+gate_tree_ssa_loop_ivopts (void)
+{
+  return flag_ivopts != 0;
+}
+
+struct tree_opt_pass pass_iv_optimize =
+{
+  "ivopts",                            /* name */
+  gate_tree_ssa_loop_ivopts,           /* gate */
+  tree_ssa_loop_ivopts,                        /* execute */
+  NULL,                                        /* sub */
+  NULL,                                        /* next */
+  0,                                   /* static_pass_number */
+  TV_TREE_LOOP_IVOPTS,                 /* tv_id */
+  PROP_cfg | PROP_ssa,                 /* properties_required */
+  0,                                   /* properties_provided */
+  0,                                   /* properties_destroyed */
+  0,                                   /* todo_flags_start */
+  TODO_dump_func,                      /* todo_flags_finish */
+  0                                    /* letter */
 };
 
 /* Loop optimizer finalization.  */
@@ -273,7 +411,6 @@ tree_ssa_loop_done (void)
   loop_optimizer_finalize (current_loops,
                           (dump_flags & TDF_DETAILS ? dump_file : NULL));
   current_loops = NULL;
-  cleanup_tree_cfg ();
 }
   
 struct tree_opt_pass pass_loop_done = 
@@ -284,11 +421,12 @@ struct tree_opt_pass pass_loop_done =
   NULL,                                        /* sub */
   NULL,                                        /* next */
   0,                                   /* static_pass_number */
-  0,                                   /* tv_id */
+  TV_TREE_LOOP_FINI,                   /* tv_id */
   PROP_cfg,                            /* properties_required */
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* todo_flags_start */
-  TODO_dump_func                       /* todo_flags_finish */
+  TODO_cleanup_cfg | TODO_dump_func,   /* todo_flags_finish */
+  0                                    /* letter */
 };