2011-09-01 Robert Dewar <dewar@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / implicit-zee.c

diff --git a/gcc/implicit-zee.c b/gcc/implicit-zee.c
index 40a270b..db42248 100644 (file)
--- a/gcc/implicit-zee.c
+++ b/gcc/implicit-zee.c
@@ -190,7 +190,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "expr.h"
 #include "insn-attr.h"
 #include "recog.h"
-#include "toplev.h"
+#include "diagnostic-core.h"
 #include "target.h"
 #include "timevar.h"
 #include "optabs.h"
@@ -726,7 +726,7 @@ combine_reaching_defs (rtx zero_extend_insn, rtx set_pat)
      in this vector.  */
 
   vec = VEC_alloc (rtx, heap, 8);
-  for (defs_ix = 0; VEC_iterate (rtx, defs_list, defs_ix, def_insn); defs_ix++)
+  FOR_EACH_VEC_ELT (rtx, defs_list, defs_ix, def_insn)
     {
       merge_code = get_insn_status (def_insn);
       gcc_assert (merge_code == MERGE_NOT_ATTEMPTED);
@@ -745,7 +745,7 @@ combine_reaching_defs (rtx zero_extend_insn, rtx set_pat)
 
   if (merge_successful)
     {
-      for (i = 0; VEC_iterate (rtx, copies_list, i, def_insn); i++)
+      FOR_EACH_VEC_ELT (rtx, copies_list, i, def_insn)
         {
           if (transform_ifelse (def_insn))
             {
@@ -772,7 +772,7 @@ combine_reaching_defs (rtx zero_extend_insn, rtx set_pat)
           if (dump_file)
             fprintf (dump_file, "All merges were successful ....\n");
 
-          for (i = 0; VEC_iterate (rtx, vec, i, def_insn); i++)
+          FOR_EACH_VEC_ELT (rtx, vec, i, def_insn)
             {
               set_insn_status (def_insn, MERGE_SUCCESS);
             }
@@ -790,7 +790,7 @@ combine_reaching_defs (rtx zero_extend_insn, rtx set_pat)
 
           if (dump_file)
             {
-              for (i = 0; VEC_iterate (rtx, vec, i, def_insn); i++)
+              FOR_EACH_VEC_ELT (rtx, vec, i, def_insn)
                 {
                   fprintf (dump_file, " Ummergable definitions : \n");
                   print_rtl_single (dump_file, def_insn);
@@ -915,7 +915,7 @@ find_and_remove_ze (void)
 
   zeinsn_list = find_removable_zero_extends ();
 
-  for (ix = 0; VEC_iterate (rtx, zeinsn_list, ix, curr_insn); ix++)
+  FOR_EACH_VEC_ELT (rtx, zeinsn_list, ix, curr_insn)
     {
       num_ze_opportunities++;
       /* Try to combine the zero-extends with the definition here.  */
@@ -936,7 +936,7 @@ find_and_remove_ze (void)
     }
 
   /* Delete all useless zero extensions here in one sweep.  */
-  for (ix = 0; VEC_iterate (rtx, zeinsn_del_list, ix, curr_insn); ix++)
+  FOR_EACH_VEC_ELT (rtx, zeinsn_del_list, ix, curr_insn)
     delete_insn (curr_insn);
 
   free (is_insn_merge_attempted);
@@ -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 */
  }
 };