[gcc r12-4043] Remove shadowed oracle field.

[gcc r12-4043] Remove shadowed oracle field.

[Aldy Hernandez]

https://gcc.gnu.org/g:75d053df7271cc0f841d3790196a14c896214bb4

commit r12-4043-g75d053df7271cc0f841d3790196a14c896214bb4
Author: Aldy Hernandez <aldyh@redhat.com>
Date:   Fri Oct 1 12:27:55 2021 +0200

    Remove shadowed oracle field.
    
    The m_oracle field in the path solver was shadowing the base class.
    This was causing subtle problems while calculating outgoing edges
    between blocks, because the query object being passed did not have an
    oracle set.
    
    This should further improve our solving ability.
    
    Tested on x86-64 Linux.
    
    gcc/ChangeLog:
    
            * gimple-range-path.cc (path_range_query::compute_ranges): Use
            get_path_oracle.
            * gimple-range-path.h (class path_range_query): Remove shadowed
            m_oracle field.
            (path_range_query::get_path_oracle): New.

Diff:
---
 gcc/gimple-range-path.cc | 2 +-
 gcc/gimple-range-path.h  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc
index a29d5318ca9..422abfddb8f 100644
--- a/gcc/gimple-range-path.cc
+++ b/gcc/gimple-range-path.cc
@@ -480,7 +480,7 @@ path_range_query::compute_ranges (const vec<basic_block> &path,
   if (m_resolve)
     {
       add_copies_to_imports ();
-      m_oracle->reset_path ();
+      get_path_oracle ()->reset_path ();
       compute_relations (path);
     }
 
diff --git a/gcc/gimple-range-path.h b/gcc/gimple-range-path.h
index cf49c6dc086..5f4e73a5949 100644
--- a/gcc/gimple-range-path.h
+++ b/gcc/gimple-range-path.h
@@ -38,7 +38,6 @@ public:
   bool range_of_expr (irange &r, tree name, gimple * = NULL) override;
   bool range_of_stmt (irange &r, gimple *, tree name = NULL) override;
   bool unreachable_path_p ();
-  path_oracle *oracle () { return m_oracle; }
   void dump (FILE *) override;
   void debug ();
 
@@ -46,6 +45,7 @@ private:
   bool internal_range_of_expr (irange &r, tree name, gimple *);
   bool defined_outside_path (tree name);
   void range_on_path_entry (irange &r, tree name);
+  path_oracle *get_path_oracle () { return (path_oracle *)m_oracle; }
 
   // Cache manipulation.
   void set_cache (const irange &r, tree name);
@@ -85,7 +85,6 @@ private:
   auto_bitmap m_imports;
   gimple_ranger &m_ranger;
   non_null_ref m_non_null;
-  path_oracle *m_oracle;
 
   // Current path position.
   unsigned m_pos;