aboutsummaryrefslogtreecommitdiff
path: root/gcc/gimple-range-path.cc
diff options
context:
space:
mode:
authorAndrew MacLeod <amacleod@redhat.com>2024-05-09 14:14:31 -0400
committerAndrew MacLeod <amacleod@redhat.com>2024-05-23 16:49:33 -0400
commita049f08239ada7d4187e9c12fab9c879668a0d05 (patch)
tree275293edacec292c34eb2c71a394d36fe8588690 /gcc/gimple-range-path.cc
parent76153635b9dc811b3ddc2c2e028d74c92d174c2e (diff)
downloadgcc-a049f08239ada7d4187e9c12fab9c879668a0d05.zip
gcc-a049f08239ada7d4187e9c12fab9c879668a0d05.tar.gz
gcc-a049f08239ada7d4187e9c12fab9c879668a0d05.tar.bz2
Gori_compute no longer inherits from gori_map.
This patch moves the gori_compute object away from inheriting a gori_map object and instead it as a local member. Export it via map (). * gimple-range-cache.cc (ranger_cache::ranger_cache): Access gori_map via member call. (ranger_cache::dump_bb): Likewise. (ranger_cache::get_global_range): Likewise. (ranger_cache::set_global_range): Likewise. (ranger_cache::register_inferred_value): Likewise. * gimple-range-fold.cc (fold_using_range::range_of_range_op): Likewise. (fold_using_range::range_of_address): Likewise. (fold_using_range::range_of_phi): Likewise. * gimple-range-gori.cc (gori_compute::compute_operand_range_switch): likewise. (gori_compute::compute_operand_range): Likewise. (gori_compute::compute_logical_operands): Likewise. (gori_compute::refine_using_relation): Likewise. (gori_compute::compute_operand1_and_operand2_range): Likewise. (gori_compute::may_recompute_p): Likewise. (gori_compute::has_edge_range_p): Likewise. (gori_compute::outgoing_edge_range_p): Likewise. (gori_compute::condexpr_adjust): Likewise. * gimple-range-gori.h (class gori_compute): Do not inherit from gori_map. (gori_compute::m_map): New. * gimple-range-path.cc (gimple-range-path.cc): Use gori_map member. (path_range_query::compute_exit_dependencies): Likewise. * gimple-range.cc (gimple_ranger::range_of_stmt): Likewise. (gimple_ranger::register_transitive_inferred_ranges): Likewise. * tree-ssa-dom.cc (set_global_ranges_from_unreachable_edges): Likewise. * tree-ssa-threadedge.cc (compute_exit_dependencies): Likewise. * tree-vrp.cc (remove_unreachable::handle_early): Likewise. (remove_unreachable::remove_and_update_globals): Likewise.
Diffstat (limited to 'gcc/gimple-range-path.cc')
-rw-r--r--gcc/gimple-range-path.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc
index b35ab43..5043c00 100644
--- a/gcc/gimple-range-path.cc
+++ b/gcc/gimple-range-path.cc
@@ -410,7 +410,7 @@ path_range_query::compute_ranges_in_block (basic_block bb)
}
gori_compute &g = m_ranger.gori ();
- bitmap exports = g.exports (bb);
+ bitmap exports = g.map()->exports (bb);
EXECUTE_IF_AND_IN_BITMAP (m_exit_dependencies, exports, 0, i, bi)
{
tree name = ssa_name (i);
@@ -488,7 +488,7 @@ path_range_query::compute_exit_dependencies (bitmap dependencies)
// Start with the imports from the exit block...
basic_block exit = m_path[0];
gori_compute &gori = m_ranger.gori ();
- bitmap_copy (dependencies, gori.imports (exit));
+ bitmap_copy (dependencies, gori.map()->imports (exit));
auto_vec<tree> worklist (bitmap_count_bits (dependencies));
bitmap_iterator bi;
@@ -536,7 +536,7 @@ path_range_query::compute_exit_dependencies (bitmap dependencies)
{
basic_block bb = m_path[i];
tree name;
- FOR_EACH_GORI_EXPORT_NAME (gori, bb, name)
+ FOR_EACH_GORI_EXPORT_NAME (*(gori.map ()), bb, name)
if (TREE_CODE (TREE_TYPE (name)) == BOOLEAN_TYPE)
bitmap_set_bit (dependencies, SSA_NAME_VERSION (name));
}