diff options
| author | Andrew MacLeod <amacleod@redhat.com> | 2023-06-10 16:05:33 -0400 |
|---|---|---|
| committer | Andrew MacLeod <amacleod@redhat.com> | 2023-06-12 10:48:30 -0400 |
| commit | b23d6b957f0a083b252c616d48f92b933f753262 (patch) | |
| tree | 58c4bb017fb6dc06fd22a4b20d09f47a72fb850a | |
| parent | 0965275e865aa1552a370075dd28286bebe18ca6 (diff) | |
| download | gcc-b23d6b957f0a083b252c616d48f92b933f753262.zip gcc-b23d6b957f0a083b252c616d48f92b933f753262.tar.gz gcc-b23d6b957f0a083b252c616d48f92b933f753262.tar.bz2 | |
Move operator_bitwise_or to the unified range-op table.
* range-op-mixed.h (class operator_bitwise_or): Move from...
* range-op.cc (unified_table::unified_table): Add BIT_IOR_EXPR.
(class operator_bitwise_or): Move from here.
(integral_table::integral_table): Remove BIT_IOR_EXPR.
| -rw-r--r-- | gcc/range-op-mixed.h | 19 | ||||
| -rw-r--r-- | gcc/range-op.cc | 28 |
2 files changed, 26 insertions, 21 deletions
diff --git a/gcc/range-op-mixed.h b/gcc/range-op-mixed.h index b3d51f8..8a11d61 100644 --- a/gcc/range-op-mixed.h +++ b/gcc/range-op-mixed.h @@ -577,4 +577,23 @@ private: const irange &op2) const; }; +class operator_bitwise_or : public range_operator +{ +public: + using range_operator::op1_range; + using range_operator::op2_range; + bool op1_range (irange &r, tree type, + const irange &lhs, const irange &op2, + relation_trio rel = TRIO_VARYING) const final override; + bool op2_range (irange &r, tree type, + const irange &lhs, const irange &op1, + relation_trio rel = TRIO_VARYING) 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; +}; + #endif // GCC_RANGE_OP_MIXED_H diff --git a/gcc/range-op.cc b/gcc/range-op.cc index 57bd95a..07e0c88 100644 --- a/gcc/range-op.cc +++ b/gcc/range-op.cc @@ -79,6 +79,7 @@ operator_addr_expr op_addr; operator_bitwise_not op_bitwise_not; operator_bitwise_xor op_bitwise_xor; operator_bitwise_and op_bitwise_and; +operator_bitwise_or op_bitwise_or; // Invoke the initialization routines for each class of range. @@ -117,6 +118,7 @@ unified_table::unified_table () // implementation. These also remain in the pointer table until a pointer // speifc version is provided. set (BIT_AND_EXPR, op_bitwise_and); + set (BIT_IOR_EXPR, op_bitwise_or); } // The tables are hidden and accessed via a simple extern function. @@ -3608,27 +3610,12 @@ operator_logical_or::op2_range (irange &r, tree type, } -class operator_bitwise_or : public range_operator +void +operator_bitwise_or::update_bitmask (irange &r, const irange &lh, + const irange &rh) const { - using range_operator::op1_range; - using range_operator::op2_range; -public: - virtual bool op1_range (irange &r, tree type, - const irange &lhs, - const irange &op2, - relation_trio rel = TRIO_VARYING) const; - virtual bool op2_range (irange &r, tree type, - const irange &lhs, - const irange &op1, - relation_trio rel = TRIO_VARYING) 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; - void update_bitmask (irange &r, const irange &lh, const irange &rh) const - { update_known_bitmask (r, BIT_IOR_EXPR, lh, rh); } -} op_bitwise_or; + update_known_bitmask (r, BIT_IOR_EXPR, lh, rh); +} void operator_bitwise_or::wi_fold (irange &r, tree type, @@ -4549,7 +4536,6 @@ integral_table::integral_table () { set (MIN_EXPR, op_min); set (MAX_EXPR, op_max); - set (BIT_IOR_EXPR, op_bitwise_or); } // Initialize any integral operators to the primary table |