aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/gimple-fold.cc2
-rw-r--r--gcc/gimple-ssa-evrp-analyze.cc2
-rw-r--r--gcc/ipa-cp.cc2
-rw-r--r--gcc/tree-ssa-dom.cc2
-rw-r--r--gcc/tree-vrp.cc8
-rw-r--r--gcc/value-range-equiv.cc4
-rw-r--r--gcc/value-range-equiv.h4
-rw-r--r--gcc/value-range.cc4
-rw-r--r--gcc/value-range.h8
-rw-r--r--gcc/vr-values.cc12
10 files changed, 24 insertions, 24 deletions
diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc
index 863ee3d..7baec11 100644
--- a/gcc/gimple-fold.cc
+++ b/gcc/gimple-fold.cc
@@ -883,7 +883,7 @@ size_must_be_zero_p (tree size)
get_global_range_query ()->range_of_expr (vr, size);
if (vr.undefined_p ())
vr.set_varying (TREE_TYPE (size));
- vr.intersect (&valid_range);
+ vr.intersect (valid_range);
return vr.zero_p ();
}
diff --git a/gcc/gimple-ssa-evrp-analyze.cc b/gcc/gimple-ssa-evrp-analyze.cc
index 5b6c9f8..fec6e87 100644
--- a/gcc/gimple-ssa-evrp-analyze.cc
+++ b/gcc/gimple-ssa-evrp-analyze.cc
@@ -207,7 +207,7 @@ evrp_range_analyzer::record_ranges_from_incoming_edge (basic_block bb)
const value_range_equiv *old_vr
= get_value_range (vrs[i].first);
value_range tem (*old_vr);
- tem.intersect (vrs[i].second);
+ tem.legacy_verbose_intersect (vrs[i].second);
if (tem.equal_p (*old_vr))
{
free_value_range (vrs[i].second);
diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc
index dc3f0e9..11f4a32 100644
--- a/gcc/ipa-cp.cc
+++ b/gcc/ipa-cp.cc
@@ -1018,7 +1018,7 @@ ipcp_vr_lattice::meet_with_1 (const value_range *other_vr)
return set_to_bottom ();
value_range save (m_vr);
- m_vr.union_ (other_vr);
+ m_vr.union_ (*other_vr);
return !m_vr.equal_p (save);
}
diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc
index 21745bf..4a0cf2e 100644
--- a/gcc/tree-ssa-dom.cc
+++ b/gcc/tree-ssa-dom.cc
@@ -694,7 +694,7 @@ dom_jt_simplifier::simplify (gimple *stmt, gimple *within_stmt,
if (TREE_CODE (op) != SSA_NAME)
return NULL_TREE;
- const value_range_equiv *vr = m_vr_values->get_value_range (op);
+ const value_range *vr = m_vr_values->get_value_range (op);
return find_case_label_range (switch_stmt, vr);
}
if (gassign *assign_stmt = dyn_cast <gassign *> (stmt))
diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc
index ab6aa11c..0cbd9d3 100644
--- a/gcc/tree-vrp.cc
+++ b/gcc/tree-vrp.cc
@@ -768,7 +768,7 @@ extract_range_from_plus_minus_expr (value_range *vr,
value_range vrres;
extract_range_from_plus_minus_expr (&vrres, code, expr_type,
&vrtem1, vr1_);
- vr->union_ (&vrres);
+ vr->union_ (vrres);
}
return;
}
@@ -782,7 +782,7 @@ extract_range_from_plus_minus_expr (value_range *vr,
value_range vrres;
extract_range_from_plus_minus_expr (&vrres, code, expr_type,
vr0_, &vrtem1);
- vr->union_ (&vrres);
+ vr->union_ (vrres);
}
return;
}
@@ -2470,7 +2470,7 @@ find_case_label_range (gswitch *switch_stmt, const irange *range_of_op)
int_range_max label_range (CASE_LOW (label), case_high);
if (!types_compatible_p (label_range.type (), range_of_op->type ()))
range_cast (label_range, range_of_op->type ());
- label_range.intersect (range_of_op);
+ label_range.intersect (*range_of_op);
if (label_range == *range_of_op)
return label;
}
@@ -2494,7 +2494,7 @@ find_case_label_range (gswitch *switch_stmt, const irange *range_of_op)
int_range_max label_range (CASE_LOW (min_label), case_high);
if (!types_compatible_p (label_range.type (), range_of_op->type ()))
range_cast (label_range, range_of_op->type ());
- label_range.intersect (range_of_op);
+ label_range.intersect (*range_of_op);
if (label_range.undefined_p ())
return gimple_switch_label (switch_stmt, 0);
}
diff --git a/gcc/value-range-equiv.cc b/gcc/value-range-equiv.cc
index 731fa53..77c6f5c 100644
--- a/gcc/value-range-equiv.cc
+++ b/gcc/value-range-equiv.cc
@@ -188,7 +188,7 @@ value_range_equiv::equiv_add (const_tree var,
}
void
-value_range_equiv::intersect (const value_range_equiv *other)
+value_range_equiv::legacy_verbose_intersect (const value_range_equiv *other)
{
if (dump_file && (dump_flags & TDF_DETAILS))
{
@@ -238,7 +238,7 @@ value_range_equiv::intersect (const value_range_equiv *other)
}
void
-value_range_equiv::union_ (const value_range_equiv *other)
+value_range_equiv::legacy_verbose_union_ (const value_range_equiv *other)
{
if (dump_file && (dump_flags & TDF_DETAILS))
{
diff --git a/gcc/value-range-equiv.h b/gcc/value-range-equiv.h
index 11b806c..0aa1069 100644
--- a/gcc/value-range-equiv.h
+++ b/gcc/value-range-equiv.h
@@ -48,8 +48,8 @@ class GTY((user)) value_range_equiv : public value_range
bool operator== (const value_range_equiv &) const /* = delete */;
bool operator!= (const value_range_equiv &) const /* = delete */;
- void intersect (const value_range_equiv *);
- void union_ (const value_range_equiv *);
+ void legacy_verbose_intersect (const value_range_equiv *);
+ void legacy_verbose_union_ (const value_range_equiv *);
bool equal_p (const value_range_equiv &, bool ignore_equivs) const;
/* Types of value ranges. */
diff --git a/gcc/value-range.cc b/gcc/value-range.cc
index 000bbcf..94301b3 100644
--- a/gcc/value-range.cc
+++ b/gcc/value-range.cc
@@ -1442,7 +1442,7 @@ irange::legacy_union (irange *vr0, const irange *vr1)
may not be the smallest possible such range. */
void
-irange::union_ (const irange *other)
+irange::legacy_verbose_union_ (const irange *other)
{
if (legacy_mode_p ())
{
@@ -1482,7 +1482,7 @@ irange::union_ (const irange *other)
}
void
-irange::intersect (const irange *other)
+irange::legacy_verbose_intersect (const irange *other)
{
if (legacy_mode_p ())
{
diff --git a/gcc/value-range.h b/gcc/value-range.h
index b64e024..90a395f 100644
--- a/gcc/value-range.h
+++ b/gcc/value-range.h
@@ -96,8 +96,8 @@ public:
bool may_contain_p (tree) const; // DEPRECATED
void set (tree); // DEPRECATED
bool equal_p (const irange &) const; // DEPRECATED
- void union_ (const class irange *); // DEPRECATED
- void intersect (const irange *); // DEPRECATED
+ void legacy_verbose_union_ (const class irange *); // DEPRECATED
+ void legacy_verbose_intersect (const irange *); // DEPRECATED
protected:
irange (tree *, unsigned);
@@ -549,7 +549,7 @@ irange::union_ (const irange &r)
{
dump_flags_t m_flags = dump_flags;
dump_flags &= ~TDF_DETAILS;
- irange::union_ (&r);
+ irange::legacy_verbose_union_ (&r);
dump_flags = m_flags;
}
@@ -558,7 +558,7 @@ irange::intersect (const irange &r)
{
dump_flags_t m_flags = dump_flags;
dump_flags &= ~TDF_DETAILS;
- irange::intersect (&r);
+ irange::legacy_verbose_intersect (&r);
dump_flags = m_flags;
}
diff --git a/gcc/vr-values.cc b/gcc/vr-values.cc
index 122586f..301996d 100644
--- a/gcc/vr-values.cc
+++ b/gcc/vr-values.cc
@@ -266,7 +266,7 @@ vr_values::update_value_range (const_tree var, value_range_equiv *new_vr)
value_range_equiv nr;
get_global_range_query ()->range_of_expr (nr, const_cast <tree> (var));
if (!nr.undefined_p ())
- new_vr->intersect (&nr);
+ new_vr->legacy_verbose_intersect (&nr);
}
/* Update the value range, if necessary. If we cannot allocate a lattice
@@ -750,7 +750,7 @@ vr_values::extract_range_for_var_from_comparison_expr (tree var,
gcc_unreachable ();
/* Finally intersect the new range with what we already know about var. */
- vr_p->intersect (get_value_range (var));
+ vr_p->legacy_verbose_intersect (get_value_range (var));
}
/* Extract value range information from an ASSERT_EXPR EXPR and store
@@ -1014,7 +1014,7 @@ vr_values::extract_range_from_cond_expr (value_range_equiv *vr, gassign *stmt)
/* The resulting value range is the union of the operand ranges */
vr->deep_copy (vr0);
- vr->union_ (vr1);
+ vr->legacy_verbose_union_ (vr1);
}
@@ -2300,10 +2300,10 @@ simplify_using_ranges::vrp_evaluate_conditional_warnv_with_ops
for previously LE_ or LT_EXPR and GT_EXPR otherwise, but
the comments next to the enclosing if suggest it's not
generally profitable to do so. */
- vro.intersect (vr0);
+ vro.legacy_verbose_intersect (vr0);
if (vro.undefined_p ())
return boolean_false_node;
- vri.intersect (vr0);
+ vri.legacy_verbose_intersect (vr0);
if (vri.undefined_p ())
return boolean_true_node;
}
@@ -2803,7 +2803,7 @@ vr_values::extract_range_from_phi_node (gphi *phi,
if (first)
vr_result->deep_copy (vr_arg);
else
- vr_result->union_ (vr_arg);
+ vr_result->legacy_verbose_union_ (vr_arg);
first = false;
if (vr_result->varying_p ())
generated by cgit v1.1 at 2025-09-27 07:53:06 +0000