From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1011) id A62DF3858D20; Mon, 12 Jun 2023 15:31:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A62DF3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686583912; bh=gFLESdSu2nUK1z9cZbnWOM65CwhZMC898Xac+NdCXUE=; h=From:To:Subject:Date:From; b=t3WZDmhu9NwBTlMMd0WIv8FkRvtqCGtfBAIoCvM2tJ7KNiE/9rc0O0djNHHx0MT5X rqgQ7q40M31vDafJWs3dWW5U8Ul+fT/nvQR74MB+o/hTUHPJachAvsgJlIjSCDkDQf pxiREdEpEbsAVPdLRIKKELOQaevdQSWLduDgcFtU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Macleod To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-1719] Move operator_addr_expr to the unified range-op table. X-Act-Checkin: gcc X-Git-Author: Andrew MacLeod X-Git-Refname: refs/heads/master X-Git-Oldrev: bf470895905e9152424076d1630a9d2c60de023b X-Git-Newrev: 443485b34365c8c50b31765d6769c4ef70091358 Message-Id: <20230612153152.A62DF3858D20@sourceware.org> Date: Mon, 12 Jun 2023 15:31:52 +0000 (GMT) List-Id: https://gcc.gnu.org/g:443485b34365c8c50b31765d6769c4ef70091358 commit r14-1719-g443485b34365c8c50b31765d6769c4ef70091358 Author: Andrew MacLeod Date: Sat Jun 10 15:56:15 2023 -0400 Move operator_addr_expr to the unified range-op table. * range-op-mixed.h (class operator_addr_expr): Move from... * range-op.cc (unified_table::unified_table): Add ADDR_EXPR. (class operator_addr_expr): Move from here. (integral_table::integral_table): Remove ADDR_EXPR. (pointer_table::pointer_table): Remove ADDR_EXPR. Diff: --- gcc/range-op-mixed.h | 13 +++++++++++++ gcc/range-op.cc | 23 +++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gcc/range-op-mixed.h b/gcc/range-op-mixed.h index 52b8570cb2a..d31b144169d 100644 --- a/gcc/range-op-mixed.h +++ b/gcc/range-op-mixed.h @@ -501,4 +501,17 @@ public: relation_kind kind) const final override; }; +class operator_addr_expr : public range_operator +{ +public: + using range_operator::fold_range; + using range_operator::op1_range; + bool fold_range (irange &r, tree type, + const irange &op1, const irange &op2, + relation_trio rel = TRIO_VARYING) const final override; + bool op1_range (irange &r, tree type, + const irange &lhs, const irange &op2, + relation_trio rel = TRIO_VARYING) const final override; +}; + #endif // GCC_RANGE_OP_MIXED_H diff --git a/gcc/range-op.cc b/gcc/range-op.cc index 028631c6851..20cc9b0dc9c 100644 --- a/gcc/range-op.cc +++ b/gcc/range-op.cc @@ -75,6 +75,7 @@ operator_abs op_abs; operator_minus op_minus; operator_negate op_negate; operator_mult op_mult; +operator_addr_expr op_addr; // Invoke the initialization routines for each class of range. @@ -102,6 +103,10 @@ unified_table::unified_table () set (MINUS_EXPR, op_minus); set (NEGATE_EXPR, op_negate); set (MULT_EXPR, op_mult); + + // Occur in both integer and pointer tables, but currently share + // integral implelmentation. + set (ADDR_EXPR, op_addr); } // The tables are hidden and accessed via a simple extern function. @@ -4366,21 +4371,6 @@ operator_negate::op1_range (irange &r, tree type, } -class operator_addr_expr : public range_operator -{ - using range_operator::fold_range; - using range_operator::op1_range; -public: - virtual bool fold_range (irange &r, tree type, - const irange &op1, - const irange &op2, - relation_trio rel = TRIO_VARYING) const; - virtual bool op1_range (irange &r, tree type, - const irange &lhs, - const irange &op2, - relation_trio rel = TRIO_VARYING) const; -} op_addr; - bool operator_addr_expr::fold_range (irange &r, tree type, const irange &lh, @@ -4613,7 +4603,6 @@ integral_table::integral_table () set (BIT_IOR_EXPR, op_bitwise_or); set (BIT_XOR_EXPR, op_bitwise_xor); set (BIT_NOT_EXPR, op_bitwise_not); - set (ADDR_EXPR, op_addr); } // Initialize any integral operators to the primary table @@ -4644,8 +4633,6 @@ pointer_table::pointer_table () set (MIN_EXPR, op_ptr_min_max); set (MAX_EXPR, op_ptr_min_max); - set (ADDR_EXPR, op_addr); - set (BIT_NOT_EXPR, op_bitwise_not); set (BIT_XOR_EXPR, op_bitwise_xor); }