Remove loop_ranger::range_of_phi as loop_ranger::range_of_stmt handles things.

3 files changed, 1 insertions, 19 deletions

diff --git a/gcc/gimple-range-cfg.h b/gcc/gimple-range-cfg.h
index 7e74ddf..e5e7676 100644
--- a/gcc/gimple-range-cfg.h
+++ b/gcc/gimple-range-cfg.h
@@ -30,12 +30,12 @@ public:
 
   virtual void range_on_entry (irange &r, basic_block bb, tree name);
   virtual void range_on_exit (irange &r, basic_block bb, tree name);
-  virtual bool range_of_phi (irange &r, gphi *phi);
 protected:
   bool range_of_range_op (irange &r, gimple *s);
   bool range_of_call (irange &r, gcall *call);
   bool range_of_cond_expr (irange &r, gassign* cond);
 private:
+  bool range_of_phi (irange &r, gphi *phi);
   bool range_of_non_trivial_assignment (irange &r, gimple *s);
   bool range_of_builtin_call (irange &r, gcall *call);
   void range_of_builtin_ubsan_call (irange &r, gcall *call, tree_code code);
diff --git a/gcc/gimple-ranger.cc b/gcc/gimple-ranger.cc
index 22853a9..dc51ff1 100644
--- a/gcc/gimple-ranger.cc
+++ b/gcc/gimple-ranger.cc
@@ -774,23 +774,6 @@ loop_ranger::range_with_loop_info (irange &r, tree name)
   return false;
 }
 
-// Virtual override of global_ranger::range_of_phi() that adjusts the
-// result with loop information if available.
-
-bool
-loop_ranger::range_of_phi (irange &r, gphi *phi)
-{
-  if (super::range_of_phi (r, phi))
-    {
-      value_range loop_range;
-      if (range_with_loop_info (loop_range, PHI_RESULT (phi)))
-	r.intersect (loop_range);
-      return true;
-    }
-  // ?? Is it worth querying loop info, or should we just return false?
-  return range_with_loop_info (r, PHI_RESULT (phi));
-}
-
 bool
 loop_ranger::range_of_stmt (irange &r, gimple *stmt, tree name)
 {
diff --git a/gcc/gimple-ranger.h b/gcc/gimple-ranger.h
index f9b7cff..e192356 100644
--- a/gcc/gimple-ranger.h
+++ b/gcc/gimple-ranger.h
@@ -84,7 +84,6 @@ public:
   loop_ranger ();
   ~loop_ranger ();
   virtual void range_on_edge (irange &r, edge e, tree name);
-  virtual bool range_of_phi (irange &r, gphi *phi);
   virtual bool range_of_stmt (irange &r, gimple *stmt, tree name);
 
 private: