Remove vr_values_tester.

It is no longer needed as we are running rvrp[12] and verifying usage
the trap code.

4 files changed, 4 insertions, 44 deletions

diff --git a/gcc/gimple-ranger.cc b/gcc/gimple-ranger.cc
index 042bd96..d299f07 100644
--- a/gcc/gimple-ranger.cc
+++ b/gcc/gimple-ranger.cc
@@ -719,7 +719,7 @@ if (DEBUG_CACHE)  fprintf (dump_file, "BACK visiting block %d\n", node->index);
 
 loop_ranger::loop_ranger ()
 {
-  m_vr_values = new vr_values_tester;
+  m_vr_values = new vr_values;
 }
 
 loop_ranger::~loop_ranger ()
diff --git a/gcc/gimple-ssa-evrp-analyze.c b/gcc/gimple-ssa-evrp-analyze.c
index ef8e05b..9f8ce55 100644
--- a/gcc/gimple-ssa-evrp-analyze.c
+++ b/gcc/gimple-ssa-evrp-analyze.c
@@ -41,8 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-cfgcleanup.h"
 #include "vr-values.h"
 #include "gimple-ssa-evrp-analyze.h"
-#include "gimple-ranger.h"
-#include "misc.h"
 
 evrp_range_analyzer::evrp_range_analyzer (bool update_global_ranges)
   : stack (10), m_update_global_ranges (update_global_ranges)
@@ -56,7 +54,7 @@ evrp_range_analyzer::evrp_range_analyzer (bool update_global_ranges)
       FOR_EACH_EDGE (e, ei, bb->preds)
         e->flags |= EDGE_EXECUTABLE;
     }
-  vr_values = new class vr_values_tester;
+  vr_values = new class vr_values;
 }
 
 /* Push an unwinding marker onto the unwinding stack.  */
@@ -154,36 +152,6 @@ all_uses_feed_or_dominated_by_stmt (tree name, gimple *stmt)
   return true;
 }
 
-// ?? Eventually overload extract_range_from_stmt instead, since it is
-// higher level and more comparable to gimple_ranger::range_of_stmt.
-
-void
-vr_values_tester::extract_range_basic (value_range_equiv *vr, gimple *stmt)
-{
-  vr_values::extract_range_basic (vr, stmt);
-
-  if (gimple_code (stmt) != GIMPLE_CALL)
-    return;
-
-  class ranger_using_vrvalues : public gimple_ranger
-  {
-  public:
-    ranger_using_vrvalues (range_store *super) : super (super) { }
-    // Use the vr_values version of range_of_expr while the ranger
-    // comes up to par.
-    virtual bool range_of_expr (irange &r, tree expr, gimple *stmt)
-    { return super->range_of_expr (r, expr, stmt); }
-  private:
-    range_store *super;
-  } ranger (this);
-
-  value_range ranger_vr;
-  ranger.range_of_stmt (ranger_vr, stmt);
-
-  vr_comparison comp (vr, &ranger_vr, this);
-  comp.compare (stmt);
-}
-
 void
 evrp_range_analyzer::record_ranges_from_incoming_edge (basic_block bb)
 {
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index f16bee4..511ae06 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -3506,7 +3506,7 @@ class vrp_prop : public ssa_propagation_engine
   bool check_mem_ref (location_t, tree, bool);
   void search_for_addr_array (tree, location_t);
 
-  class vr_values_tester vr_values;
+  class vr_values vr_values;
   /* Temporary delegator to minimize code churn.  */
   const value_range_equiv *get_value_range (const_tree op)
     { return vr_values.get_value_range (op); }
diff --git a/gcc/vr-values.h b/gcc/vr-values.h
index 2629d88..4b2cbce 100644
--- a/gcc/vr-values.h
+++ b/gcc/vr-values.h
@@ -97,9 +97,8 @@ private:
    range information fast or perform on-demand queries.  */
 class vr_values : public range_store
 {
- protected:
-  vr_values (void); // FIXME: temporary for vr_values_tester.
  public:
+  vr_values (void);
   virtual ~vr_values (void);
 
   const value_range_equiv *get_value_range (const_tree, gimple *stmt = NULL);
@@ -119,7 +118,6 @@ class vr_values : public range_store
 						   tree, tree,
 						   value_range_equiv *);
   void extract_range_from_phi_node (gphi *, value_range_equiv *);
-  virtual // FIXME: temporary tester for vr_values_tester.
   void extract_range_basic (value_range_equiv *, gimple *);
   void extract_range_from_stmt (gimple *, edge *, tree *, value_range_equiv *);
 
@@ -174,10 +172,4 @@ extern tree get_output_for_vrp (gimple *);
 // FIXME: Move this to tree-vrp.c.
 void simplify_cond_using_ranges_2 (range_store *, gcond *);
 
-class vr_values_tester : public vr_values
-{
-public:
-  void extract_range_basic (value_range_equiv *, gimple *);
-};
-
 #endif /* GCC_VR_VALUES_H */