From cc4eaf6f1e1958f920007d4cc7cafb635b5dda64 Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacleod@redhat.com>
Date: Fri, 9 Jun 2023 13:41:28 -0400
Subject: [PATCH 11/31] Unify PLUS_EXPR range operator
Move the declaration of the class to the range-op-mixed header, add the
floating point prototypes as well, and use it in the new unified table.
* range-op-float.cc (foperator_plus): Remove. Move prototypes
to range-op-mixed.h
(operator_plus::fold_range): Rename from foperator_plus.
(operator_plus::op1_range): Ditto.
(operator_plus::op2_range): Ditto.
(operator_plus::rv_fold): Ditto.
(float_table::float_table): Remove PLUS_EXPR.
* range-op-mixed.h (class operator_plus): Combined from integer
and float files.
* range-op.cc (op_plus): New object.
(unified_table::unified_table): Add PLUS_EXPR.
(class operator_plus): Move to range-op-mixed.h.
(integral_table::integral_table): Remove PLUS_EXPR.
(pointer_table::pointer_table): Remove PLUS_EXPR.
---
gcc/range-op-float.cc | 94 ++++++++++++++++++++-----------------------
gcc/range-op-mixed.h | 39 ++++++++++++++++++
gcc/range-op.cc | 37 ++++-------------
3 files changed, 90 insertions(+), 80 deletions(-)
@@ -2254,54 +2254,49 @@ float_widen_lhs_range (tree type, const frange &lhs)
return ret;
}
-class foperator_plus : public range_operator
+bool
+operator_plus::op1_range (frange &r, tree type, const frange &lhs,
+ const frange &op2, relation_trio) const
{
- using range_operator::op1_range;
- using range_operator::op2_range;
-public:
- virtual bool op1_range (frange &r, tree type,
- const frange &lhs,
- const frange &op2,
- relation_trio = TRIO_VARYING) const final override
- {
- if (lhs.undefined_p ())
- return false;
- range_op_handler minus (MINUS_EXPR, type);
- if (!minus)
- return false;
- frange wlhs = float_widen_lhs_range (type, lhs);
- return float_binary_op_range_finish (minus.fold_range (r, type, wlhs, op2),
- r, type, wlhs);
- }
- virtual bool op2_range (frange &r, tree type,
- const frange &lhs,
- const frange &op1,
- relation_trio = TRIO_VARYING) const final override
- {
- return op1_range (r, type, lhs, op1);
- }
-private:
- void rv_fold (REAL_VALUE_TYPE &lb, REAL_VALUE_TYPE &ub, bool &maybe_nan,
- tree type,
- const REAL_VALUE_TYPE &lh_lb,
- const REAL_VALUE_TYPE &lh_ub,
- const REAL_VALUE_TYPE &rh_lb,
- const REAL_VALUE_TYPE &rh_ub,
- relation_kind) const final override
- {
- frange_arithmetic (PLUS_EXPR, type, lb, lh_lb, rh_lb, dconstninf);
- frange_arithmetic (PLUS_EXPR, type, ub, lh_ub, rh_ub, dconstinf);
+ if (lhs.undefined_p ())
+ return false;
+ range_op_handler minus (MINUS_EXPR, type);
+ if (!minus)
+ return false;
+ frange wlhs = float_widen_lhs_range (type, lhs);
+ return float_binary_op_range_finish (minus.fold_range (r, type, wlhs, op2),
+ r, type, wlhs);
+}
- // [-INF] + [+INF] = NAN
- if (real_isinf (&lh_lb, true) && real_isinf (&rh_ub, false))
- maybe_nan = true;
- // [+INF] + [-INF] = NAN
- else if (real_isinf (&lh_ub, false) && real_isinf (&rh_lb, true))
- maybe_nan = true;
- else
- maybe_nan = false;
- }
-} fop_plus;
+bool
+operator_plus::op2_range (frange &r, tree type,
+ const frange &lhs, const frange &op1,
+ relation_trio) const
+{
+ return op1_range (r, type, lhs, op1);
+}
+
+void
+operator_plus::rv_fold (REAL_VALUE_TYPE &lb, REAL_VALUE_TYPE &ub,
+ bool &maybe_nan, tree type,
+ const REAL_VALUE_TYPE &lh_lb,
+ const REAL_VALUE_TYPE &lh_ub,
+ const REAL_VALUE_TYPE &rh_lb,
+ const REAL_VALUE_TYPE &rh_ub,
+ relation_kind) const
+{
+ frange_arithmetic (PLUS_EXPR, type, lb, lh_lb, rh_lb, dconstninf);
+ frange_arithmetic (PLUS_EXPR, type, ub, lh_ub, rh_ub, dconstinf);
+
+ // [-INF] + [+INF] = NAN
+ if (real_isinf (&lh_lb, true) && real_isinf (&rh_ub, false))
+ maybe_nan = true;
+ // [+INF] + [-INF] = NAN
+ else if (real_isinf (&lh_ub, false) && real_isinf (&rh_lb, true))
+ maybe_nan = true;
+ else
+ maybe_nan = false;
+}
class foperator_minus : public range_operator
@@ -2317,9 +2312,9 @@ public:
if (lhs.undefined_p ())
return false;
frange wlhs = float_widen_lhs_range (type, lhs);
- return float_binary_op_range_finish (fop_plus.fold_range (r, type, wlhs,
- op2),
- r, type, wlhs);
+ return float_binary_op_range_finish (
+ range_op_handler (PLUS_EXPR).fold_range (r, type, wlhs, op2),
+ r, type, wlhs);
}
virtual bool op2_range (frange &r, tree type,
const frange &lhs,
@@ -2698,7 +2693,6 @@ float_table::float_table ()
{
set (ABS_EXPR, fop_abs);
set (NEGATE_EXPR, fop_negate);
- set (PLUS_EXPR, fop_plus);
set (MINUS_EXPR, fop_minus);
set (MULT_EXPR, fop_mult);
}
@@ -328,4 +328,43 @@ private:
const irange &outer) const;
};
+class operator_plus : public range_operator
+{
+public:
+ using range_operator::op1_range;
+ using range_operator::op2_range;
+ using range_operator::lhs_op1_relation;
+ using range_operator::lhs_op2_relation;
+ bool op1_range (irange &r, tree type,
+ const irange &lhs, const irange &op2,
+ relation_trio) const final override;
+ bool op1_range (frange &r, tree type,
+ const frange &lhs, const frange &op2,
+ relation_trio = TRIO_VARYING) const final override;
+
+ bool op2_range (irange &r, tree type,
+ const irange &lhs, const irange &op1,
+ relation_trio) const final override;
+ bool op2_range (frange &r, tree type,
+ const frange &lhs, const frange &op1,
+ relation_trio = TRIO_VARYING) const final override;
+
+ relation_kind lhs_op1_relation (const irange &lhs, const irange &op1,
+ const irange &op2,
+ relation_kind rel) const final override;
+ relation_kind lhs_op2_relation (const irange &lhs, const irange &op1,
+ const irange &op2,
+ relation_kind rel) const final override;
+ void update_bitmask (irange &r, const irange &lh,
+ const irange &rh) const final override;
+private:
+ void wi_fold (irange &r, tree type, const wide_int &lh_lb,
+ const wide_int &lh_ub, const wide_int &rh_lb,
+ const wide_int &rh_ub) const final override;
+ void rv_fold (REAL_VALUE_TYPE &lb, REAL_VALUE_TYPE &ub,
+ bool &maybe_nan, tree type,
+ const REAL_VALUE_TYPE &lh_lb, const REAL_VALUE_TYPE &lh_ub,
+ const REAL_VALUE_TYPE &rh_lb, const REAL_VALUE_TYPE &rh_ub,
+ relation_kind) const final override;
+};
#endif // GCC_RANGE_OP_MIXED_H
@@ -71,6 +71,7 @@ operator_ge op_ge;
operator_identity op_ident;
operator_cst op_cst;
operator_cast op_cast;
+operator_plus op_plus;
// Invoke the initialization routines for each class of range.
@@ -93,7 +94,7 @@ unified_table::unified_table ()
set (INTEGER_CST, op_cst);
set (NOP_EXPR, op_cast);
set (CONVERT_EXPR, op_cast);
-
+ set (PLUS_EXPR, op_plus);
}
// The tables are hidden and accessed via a simple extern function.
@@ -1498,35 +1499,12 @@ operator_ge::op2_range (irange &r, tree type,
}
-class operator_plus : public range_operator
+void
+operator_plus::update_bitmask (irange &r, const irange &lh,
+ const irange &rh) const
{
- using range_operator::op1_range;
- using range_operator::op2_range;
- using range_operator::lhs_op1_relation;
- using range_operator::lhs_op2_relation;
-public:
- virtual bool op1_range (irange &r, tree type,
- const irange &lhs,
- const irange &op2,
- relation_trio) const;
- virtual bool op2_range (irange &r, tree type,
- const irange &lhs,
- const irange &op1,
- relation_trio) const;
- virtual void wi_fold (irange &r, tree type,
- const wide_int &lh_lb,
- const wide_int &lh_ub,
- const wide_int &rh_lb,
- const wide_int &rh_ub) const;
- virtual relation_kind lhs_op1_relation (const irange &lhs, const irange &op1,
- const irange &op2,
- relation_kind rel) const;
- virtual relation_kind lhs_op2_relation (const irange &lhs, const irange &op1,
- const irange &op2,
- relation_kind rel) const;
- void update_bitmask (irange &r, const irange &lh, const irange &rh) const
- { update_known_bitmask (r, PLUS_EXPR, lh, rh); }
-} op_plus;
+ update_known_bitmask (r, PLUS_EXPR, lh, rh);
+}
// Check to see if the range of OP2 indicates anything about the relation
// between LHS and OP1.
@@ -4717,7 +4695,6 @@ pointer_or_operator::wi_fold (irange &r, tree type,
integral_table::integral_table ()
{
- set (PLUS_EXPR, op_plus);
set (MINUS_EXPR, op_minus);
set (MIN_EXPR, op_min);
set (MAX_EXPR, op_max);
--
2.40.1