@@ -1143,10 +1143,11 @@ region_model_manager::get_or_create_unmergeable (const svalue *arg)
and ITER_SVAL at POINT, creating it if necessary. */
const svalue *
-region_model_manager::get_or_create_widening_svalue (tree type,
- const program_point &point,
- const svalue *base_sval,
- const svalue *iter_sval)
+region_model_manager::
+get_or_create_widening_svalue (tree type,
+ const function_point &point,
+ const svalue *base_sval,
+ const svalue *iter_sval)
{
gcc_assert (base_sval->get_kind () != SK_WIDENING);
gcc_assert (iter_sval->get_kind () != SK_WIDENING);
@@ -7956,7 +7956,7 @@ static void
test_widening_constraints ()
{
region_model_manager mgr;
- program_point point (program_point::origin (mgr));
+ function_point point (program_point::origin (mgr).get_function_point ());
tree int_0 = build_int_cst (integer_type_node, 0);
tree int_m1 = build_int_cst (integer_type_node, -1);
tree int_1 = build_int_cst (integer_type_node, 1);
@@ -278,7 +278,7 @@ public:
const svalue *inner_svalue);
const svalue *get_or_create_unmergeable (const svalue *arg);
const svalue *get_or_create_widening_svalue (tree type,
- const program_point &point,
+ const function_point &point,
const svalue *base_svalue,
const svalue *iter_svalue);
const svalue *get_or_create_compound_svalue (tree type,
@@ -1282,6 +1282,10 @@ struct model_merger
}
bool mergeable_svalue_p (const svalue *) const;
+ const function_point &get_function_point () const
+ {
+ return m_point.get_function_point ();
+ }
const region_model *m_model_a;
const region_model *m_model_b;
@@ -207,7 +207,7 @@ svalue::can_merge_p (const svalue *other,
if (maybe_get_constant () && other->maybe_get_constant ())
{
return mgr->get_or_create_widening_svalue (other->get_type (),
- merger->m_point,
+ merger->get_function_point (),
other, this);
}
@@ -220,7 +220,7 @@ svalue::can_merge_p (const svalue *other,
&& binop_sval->get_arg1 ()->get_kind () == SK_CONSTANT
&& other->get_kind () != SK_WIDENING)
return mgr->get_or_create_widening_svalue (other->get_type (),
- merger->m_point,
+ merger->get_function_point (),
other, this);
/* Merge: (Widen(existing_val, V), existing_val) -> Widen (existing_val, V)
@@ -1113,9 +1113,9 @@ public:
/* A support class for uniquifying instances of widening_svalue. */
struct key_t
{
- key_t (tree type, const program_point &point,
+ key_t (tree type, const function_point &point,
const svalue *base_sval, const svalue *iter_sval)
- : m_type (type), m_point (point.get_function_point ()),
+ : m_type (type), m_point (point),
m_base_sval (base_sval), m_iter_sval (iter_sval)
{}
@@ -1153,12 +1153,12 @@ public:
DIR_UNKNOWN
};
- widening_svalue (tree type, const program_point &point,
+ widening_svalue (tree type, const function_point &point,
const svalue *base_sval, const svalue *iter_sval)
: svalue (complexity::from_pair (base_sval->get_complexity (),
iter_sval->get_complexity ()),
type),
- m_point (point.get_function_point ()),
+ m_point (point),
m_base_sval (base_sval), m_iter_sval (iter_sval)
{
gcc_assert (base_sval->can_have_associated_state_p ());