From f8ac2b15d1ce8cbb2f4a4ba89afbd87a8aa5c4e6 Mon Sep 17 00:00:00 2001 From: Aldy Hernandez Date: Wed, 9 Nov 2022 16:35:40 +0100 Subject: [PATCH] Revert op[12]_range operators for PLUS_EXPR and MINUS_EXPR. Revert the patch below until issues are resolved: commit 4287e8168f89e90b3dff3a50f3ada40be53e0e01 Author: Aldy Hernandez Date: Wed Nov 9 01:00:57 2022 +0100 Implement op[12]_range operators for PLUS_EXPR and MINUS_EXPR. We can implement the op[12]_range entries for plus and minus in terms of each other. These are adapted from the integer versions. gcc/ChangeLog: * range-op-float.cc (class foperator_plus): Remove op[12]_range. (class foperator_minus): Same. --- gcc/range-op-float.cc | 45 ------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc index cc806438a19..380142b4c14 100644 --- a/gcc/range-op-float.cc +++ b/gcc/range-op-float.cc @@ -1863,29 +1863,6 @@ foperator_unordered_equal::op1_range (frange &r, tree type, class foperator_plus : public range_operator_float { - using range_operator_float::op1_range; - using range_operator_float::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; - return minus.fold_range (r, type, lhs, op2); - } - 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, @@ -1910,28 +1887,6 @@ private: class foperator_minus : public range_operator_float { - using range_operator_float::op1_range; - using range_operator_float::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; - return fop_plus.fold_range (r, type, lhs, op2); - } - virtual bool op2_range (frange &r, tree type, - const frange &lhs, - const frange &op1, - relation_trio = TRIO_VARYING) const final override - { - if (lhs.undefined_p ()) - return false; - return fold_range (r, type, op1, lhs); - } -private: void rv_fold (REAL_VALUE_TYPE &lb, REAL_VALUE_TYPE &ub, bool &maybe_nan, tree type, const REAL_VALUE_TYPE &lh_lb, -- 2.38.1