--- a/gcc/tree-vectorizer.c	Tue May 25 18:58:51 2010 +0900
+++ b/gcc/tree-vectorizer.c	Tue Mar 22 17:18:12 2011 +0900
@@ -61,7 +61,6 @@
 #include "tm.h"
 #include "ggc.h"
 #include "tree.h"
-#include "diagnostic.h"
 #include "tree-pretty-print.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
@@ -76,8 +75,7 @@
 
 /* vect_verbosity_level set to an invalid value
    to mark that it's uninitialized.  */
-static enum verbosity_levels vect_verbosity_level = MAX_VERBOSITY_LEVEL;
-static enum verbosity_levels user_vect_verbosity_level = MAX_VERBOSITY_LEVEL;
+static enum vect_verbosity_levels vect_verbosity_level = MAX_VERBOSITY_LEVEL;
 
 /* Loop or bb location.  */
 LOC vect_location;
@@ -87,25 +85,6 @@
 
 
 
-/* Function vect_set_verbosity_level.
-
-   Called from opts.c upon detection of the
-   -ftree-vectorizer-verbose=N option.  */
-
-void
-vect_set_verbosity_level (const char *val)
-{
-   unsigned int vl;
-
-   vl = atoi (val);
-   if (vl < MAX_VERBOSITY_LEVEL)
-     user_vect_verbosity_level = (enum verbosity_levels) vl;
-   else
-     user_vect_verbosity_level
-      = (enum verbosity_levels) (MAX_VERBOSITY_LEVEL - 1);
-}
-
-
 /* Function vect_set_dump_settings.
 
    Fix the verbosity level of the vectorizer if the
@@ -162,7 +141,7 @@
    For vectorization debug dumps.  */
 
 bool
-vect_print_dump_info (enum verbosity_levels vl)
+vect_print_dump_info (enum vect_verbosity_levels vl)
 {
   if (vl > vect_verbosity_level)
     return false;
@@ -209,7 +188,7 @@
   /*  ----------- Analyze loops. -----------  */
 
   /* If some loop was duplicated, it gets bigger number
-     than all previously defined loops. This fact allows us to run
+     than all previously defined loops.  This fact allows us to run
      only over initial loops skipping newly generated ones.  */
   FOR_EACH_LOOP (li, loop, 0)
     if (optimize_loop_nest_for_speed_p (loop))
@@ -384,7 +363,7 @@
   NULL,                                 /* sub */
   NULL,                                 /* next */
   0,                                    /* static_pass_number */
-  TV_NONE,                              /* tv_id */
+  TV_IPA_OPT,                           /* tv_id */
   0,                                    /* properties_required */
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */