Adjust variable names and comments in value-query.*
Now that range_of_expr can take arbitrary tree expressions, not just
SSA names or constants, the method names and comments are slightly out
of date. This patch adjusts them to reflect reality.
gcc/ChangeLog:
* value-query.cc (value_query::value_on_edge): Rename name to
expr.
(range_query::range_on_edge): Same.
(range_query::value_of_expr): Same.
(range_query::value_on_edge): Same.
* value-query.h (class value_query): Same.
(class range_query): Same.
diff --git a/gcc/value-query.cc b/gcc/value-query.cc
index 821f224..9047e27 100644
--- a/gcc/value-query.cc
+++ b/gcc/value-query.cc
@@ -36,9 +36,9 @@
// value_query default methods.
tree
-value_query::value_on_edge (edge, tree name)
+value_query::value_on_edge (edge, tree expr)
{
- return value_of_expr (name);
+ return value_of_expr (expr);
}
tree
@@ -57,9 +57,9 @@
// range_query default methods.
bool
-range_query::range_on_edge (irange &r, edge, tree name)
+range_query::range_on_edge (irange &r, edge, tree expr)
{
- return range_of_expr (r, name);
+ return range_of_expr (r, expr);
}
bool
@@ -76,20 +76,20 @@
}
tree
-range_query::value_of_expr (tree name, gimple *stmt)
+range_query::value_of_expr (tree expr, gimple *stmt)
{
tree t;
int_range_max r;
- if (!irange::supports_type_p (TREE_TYPE (name)))
+ if (!irange::supports_type_p (TREE_TYPE (expr)))
return NULL_TREE;
- if (range_of_expr (r, name, stmt))
+ if (range_of_expr (r, expr, stmt))
{
// A constant used in an unreachable block oftens returns as UNDEFINED.
// If the result is undefined, check the global value for a constant.
if (r.undefined_p ())
- range_of_expr (r, name);
+ range_of_expr (r, expr);
if (r.singleton_p (&t))
return t;
}
@@ -97,19 +97,19 @@
}
tree
-range_query::value_on_edge (edge e, tree name)
+range_query::value_on_edge (edge e, tree expr)
{
tree t;
int_range_max r;
- if (!irange::supports_type_p (TREE_TYPE (name)))
+ if (!irange::supports_type_p (TREE_TYPE (expr)))
return NULL_TREE;
- if (range_on_edge (r, e, name))
+ if (range_on_edge (r, e, expr))
{
// A constant used in an unreachable block oftens returns as UNDEFINED.
// If the result is undefined, check the global value for a constant.
if (r.undefined_p ())
- range_of_expr (r, name);
+ range_of_expr (r, expr);
if (r.singleton_p (&t))
return t;
}
diff --git a/gcc/value-query.h b/gcc/value-query.h
index 77e49e9..54af031 100644
--- a/gcc/value-query.h
+++ b/gcc/value-query.h
@@ -39,12 +39,12 @@
{
public:
value_query () { }
- // Return the singleton expression for NAME at a gimple statement,
+ // Return the singleton expression for EXPR at a gimple statement,
// or NULL if none found.
- virtual tree value_of_expr (tree name, gimple * = NULL) = 0;
- // Return the singleton expression for NAME at an edge, or NULL if
+ virtual tree value_of_expr (tree expr, gimple * = NULL) = 0;
+ // Return the singleton expression for EXPR at an edge, or NULL if
// none found.
- virtual tree value_on_edge (edge, tree name);
+ virtual tree value_on_edge (edge, tree expr);
// Return the singleton expression for the LHS of a gimple
// statement, assuming an (optional) initial value of NAME. Returns
// NULL if none found.
@@ -77,8 +77,8 @@
range_query ();
virtual ~range_query ();
- virtual tree value_of_expr (tree name, gimple * = NULL) OVERRIDE;
- virtual tree value_on_edge (edge, tree name) OVERRIDE;
+ virtual tree value_of_expr (tree expr, gimple * = NULL) OVERRIDE;
+ virtual tree value_on_edge (edge, tree expr) OVERRIDE;
virtual tree value_of_stmt (gimple *, tree name = NULL) OVERRIDE;
// These are the range equivalents of the value_* methods. Instead
@@ -86,9 +86,9 @@
// R. TRUE is returned on success or FALSE if no range was found.
//
// Note that range_of_expr must always return TRUE unless ranges are
- // unsupported for NAME's type (supports_type_p is false).
- virtual bool range_of_expr (irange &r, tree name, gimple * = NULL) = 0;
- virtual bool range_on_edge (irange &r, edge, tree name);
+ // unsupported for EXPR's type (supports_type_p is false).
+ virtual bool range_of_expr (irange &r, tree expr, gimple * = NULL) = 0;
+ virtual bool range_on_edge (irange &r, edge, tree expr);
virtual bool range_of_stmt (irange &r, gimple *, tree name = NULL);
// DEPRECATED: This method is used from vr-values. The plan is to
