From patchwork Fri Apr 29 09:02:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 53343 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 73B53385734B for ; Fri, 29 Apr 2022 09:09:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 73B53385734B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1651223347; bh=S2138/Q0L/KeYsbE4y2Pw0+TNWsyNgr1t9JP2jmAw/w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=kYgaxtFc9VCgfYgsp0qEX5ShReoWrn4Zutkpl2jWBlojULNETy4GoBWRuCma+vN4U O0LTxN3vYHi7psMO2FYGNa/sAnRMsx3BfAvn2P+rd84O6pbY7D9BVzjppPxGeAAwqy qfvldQ63lfNRB4KbMKY+I6Ol9HFR6kgLzbNqoKdY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id A81B83857365 for ; Fri, 29 Apr 2022 09:06:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A81B83857365 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-179-4IU3WkC_MtmkIEAEd3GW6A-1; Fri, 29 Apr 2022 05:06:54 -0400 X-MC-Unique: 4IU3WkC_MtmkIEAEd3GW6A-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A9FB82811818 for ; Fri, 29 Apr 2022 09:06:54 +0000 (UTC) Received: from abulafia (unknown [10.39.192.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5AFB45553C9; Fri, 29 Apr 2022 09:06:54 +0000 (UTC) Received: from abulafia (localhost [127.0.0.1]) by abulafia (8.17.1/8.17.1) with ESMTPS id 23T96qLf731708 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 29 Apr 2022 11:06:52 +0200 Received: (from aldyh@localhost) by abulafia (8.17.1/8.17.1/Submit) id 23T96pjR731605; Fri, 29 Apr 2022 11:06:51 +0200 To: GCC patches Subject: [COMMITTED] Remove various deprecated methods in class irange. Date: Fri, 29 Apr 2022 11:02:35 +0200 Message-Id: <20220429090236.718140-4-aldyh@redhat.com> In-Reply-To: <20220429090236.718140-1-aldyh@redhat.com> References: <20220429090236.718140-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Aldy Hernandez via Gcc-patches From: Aldy Hernandez Reply-To: Aldy Hernandez Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This patch cleans up some irange methods in preparation for other cleanups later in the cycle. First, we prefer the reference overloads for union and intersect as the pointer versions have been deprecated for a couple releases. Also, I've renamed the legacy union/intersect whose only function was to provide additional verbosity for VRP into legacy_verbose_{union,intersect}. This is a temporary rename to serve as a visual reminder of which of the methods are bound for the chopping block when the legacy code gets removed later this cycle. Tested on x86-64 Linux. gcc/ChangeLog: * gimple-fold.cc (size_must_be_zero_p): Use reference instead of pointer * gimple-ssa-evrp-analyze.cc (evrp_range_analyzer::record_ranges_from_incoming_edge): Rename intersect to legacy_verbose_intersect. * ipa-cp.cc (ipcp_vr_lattice::meet_with_1): Use reference instead of pointer. * tree-ssa-dom.cc (dom_jt_simplifier::simplify): Use value_range instead of value_range_equiv. * tree-vrp.cc (extract_range_from_plus_minus_expr): Use reference instead of pointer. (find_case_label_range): Same. * value-range-equiv.cc (value_range_equiv::intersect): Rename to... (value_range_equiv::legacy_verbose_intersect): ...this. (value_range_equiv::union_): Rename to... (value_range_equiv::legacy_verbose_union_): ...this. * value-range-equiv.h (class value_range_equiv): Rename union and intersect to legacy_verbose_{intersect,union}. * value-range.cc (irange::union_): Rename to... (irange::legacy_verbose_union_): ...this. (irange::intersect): Rename to... (irange::legacy_verbose_intersect): ...this. * value-range.h (irange::union_): Rename union_ to legacy_verbose_union. (irange::intersect): Rename intersect to legacy_verbose_intersect. * vr-values.cc (vr_values::update_value_range): Same. (vr_values::extract_range_for_var_from_comparison_expr): Same. (vr_values::extract_range_from_cond_expr): Rename union_ to legacy_verbose_union. (vr_values::extract_range_from_phi_node): Same. --- gcc/gimple-fold.cc | 2 +- gcc/gimple-ssa-evrp-analyze.cc | 2 +- gcc/ipa-cp.cc | 2 +- gcc/tree-ssa-dom.cc | 2 +- gcc/tree-vrp.cc | 8 ++++---- gcc/value-range-equiv.cc | 4 ++-- gcc/value-range-equiv.h | 4 ++-- gcc/value-range.cc | 4 ++-- gcc/value-range.h | 8 ++++---- gcc/vr-values.cc | 12 ++++++------ 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc index 863ee3d3912..7baec119ba3 100644 --- a/gcc/gimple-fold.cc +++ b/gcc/gimple-fold.cc @@ -883,7 +883,7 @@ size_must_be_zero_p (tree size) get_global_range_query ()->range_of_expr (vr, size); if (vr.undefined_p ()) vr.set_varying (TREE_TYPE (size)); - vr.intersect (&valid_range); + vr.intersect (valid_range); return vr.zero_p (); } diff --git a/gcc/gimple-ssa-evrp-analyze.cc b/gcc/gimple-ssa-evrp-analyze.cc index 5b6c9f8fe1b..fec6e87ba80 100644 --- a/gcc/gimple-ssa-evrp-analyze.cc +++ b/gcc/gimple-ssa-evrp-analyze.cc @@ -207,7 +207,7 @@ evrp_range_analyzer::record_ranges_from_incoming_edge (basic_block bb) const value_range_equiv *old_vr = get_value_range (vrs[i].first); value_range tem (*old_vr); - tem.intersect (vrs[i].second); + tem.legacy_verbose_intersect (vrs[i].second); if (tem.equal_p (*old_vr)) { free_value_range (vrs[i].second); diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc index dc3f0e94b17..11f4a327b99 100644 --- a/gcc/ipa-cp.cc +++ b/gcc/ipa-cp.cc @@ -1018,7 +1018,7 @@ ipcp_vr_lattice::meet_with_1 (const value_range *other_vr) return set_to_bottom (); value_range save (m_vr); - m_vr.union_ (other_vr); + m_vr.union_ (*other_vr); return !m_vr.equal_p (save); } diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc index 21745bf31d3..4a0cf2ef54c 100644 --- a/gcc/tree-ssa-dom.cc +++ b/gcc/tree-ssa-dom.cc @@ -694,7 +694,7 @@ dom_jt_simplifier::simplify (gimple *stmt, gimple *within_stmt, if (TREE_CODE (op) != SSA_NAME) return NULL_TREE; - const value_range_equiv *vr = m_vr_values->get_value_range (op); + const value_range *vr = m_vr_values->get_value_range (op); return find_case_label_range (switch_stmt, vr); } if (gassign *assign_stmt = dyn_cast (stmt)) diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc index ab6aa11c044..0cbd9d369ca 100644 --- a/gcc/tree-vrp.cc +++ b/gcc/tree-vrp.cc @@ -768,7 +768,7 @@ extract_range_from_plus_minus_expr (value_range *vr, value_range vrres; extract_range_from_plus_minus_expr (&vrres, code, expr_type, &vrtem1, vr1_); - vr->union_ (&vrres); + vr->union_ (vrres); } return; } @@ -782,7 +782,7 @@ extract_range_from_plus_minus_expr (value_range *vr, value_range vrres; extract_range_from_plus_minus_expr (&vrres, code, expr_type, vr0_, &vrtem1); - vr->union_ (&vrres); + vr->union_ (vrres); } return; } @@ -2470,7 +2470,7 @@ find_case_label_range (gswitch *switch_stmt, const irange *range_of_op) int_range_max label_range (CASE_LOW (label), case_high); if (!types_compatible_p (label_range.type (), range_of_op->type ())) range_cast (label_range, range_of_op->type ()); - label_range.intersect (range_of_op); + label_range.intersect (*range_of_op); if (label_range == *range_of_op) return label; } @@ -2494,7 +2494,7 @@ find_case_label_range (gswitch *switch_stmt, const irange *range_of_op) int_range_max label_range (CASE_LOW (min_label), case_high); if (!types_compatible_p (label_range.type (), range_of_op->type ())) range_cast (label_range, range_of_op->type ()); - label_range.intersect (range_of_op); + label_range.intersect (*range_of_op); if (label_range.undefined_p ()) return gimple_switch_label (switch_stmt, 0); } diff --git a/gcc/value-range-equiv.cc b/gcc/value-range-equiv.cc index 731fa53941d..77c6f5ca99d 100644 --- a/gcc/value-range-equiv.cc +++ b/gcc/value-range-equiv.cc @@ -188,7 +188,7 @@ value_range_equiv::equiv_add (const_tree var, } void -value_range_equiv::intersect (const value_range_equiv *other) +value_range_equiv::legacy_verbose_intersect (const value_range_equiv *other) { if (dump_file && (dump_flags & TDF_DETAILS)) { @@ -238,7 +238,7 @@ value_range_equiv::intersect (const value_range_equiv *other) } void -value_range_equiv::union_ (const value_range_equiv *other) +value_range_equiv::legacy_verbose_union_ (const value_range_equiv *other) { if (dump_file && (dump_flags & TDF_DETAILS)) { diff --git a/gcc/value-range-equiv.h b/gcc/value-range-equiv.h index 11b806c9141..0aa1069cb61 100644 --- a/gcc/value-range-equiv.h +++ b/gcc/value-range-equiv.h @@ -48,8 +48,8 @@ class GTY((user)) value_range_equiv : public value_range bool operator== (const value_range_equiv &) const /* = delete */; bool operator!= (const value_range_equiv &) const /* = delete */; - void intersect (const value_range_equiv *); - void union_ (const value_range_equiv *); + void legacy_verbose_intersect (const value_range_equiv *); + void legacy_verbose_union_ (const value_range_equiv *); bool equal_p (const value_range_equiv &, bool ignore_equivs) const; /* Types of value ranges. */ diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 000bbcf8917..94301b32c37 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -1442,7 +1442,7 @@ irange::legacy_union (irange *vr0, const irange *vr1) may not be the smallest possible such range. */ void -irange::union_ (const irange *other) +irange::legacy_verbose_union_ (const irange *other) { if (legacy_mode_p ()) { @@ -1482,7 +1482,7 @@ irange::union_ (const irange *other) } void -irange::intersect (const irange *other) +irange::legacy_verbose_intersect (const irange *other) { if (legacy_mode_p ()) { diff --git a/gcc/value-range.h b/gcc/value-range.h index b64e02426ca..90a395f4d73 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -96,8 +96,8 @@ public: bool may_contain_p (tree) const; // DEPRECATED void set (tree); // DEPRECATED bool equal_p (const irange &) const; // DEPRECATED - void union_ (const class irange *); // DEPRECATED - void intersect (const irange *); // DEPRECATED + void legacy_verbose_union_ (const class irange *); // DEPRECATED + void legacy_verbose_intersect (const irange *); // DEPRECATED protected: irange (tree *, unsigned); @@ -549,7 +549,7 @@ irange::union_ (const irange &r) { dump_flags_t m_flags = dump_flags; dump_flags &= ~TDF_DETAILS; - irange::union_ (&r); + irange::legacy_verbose_union_ (&r); dump_flags = m_flags; } @@ -558,7 +558,7 @@ irange::intersect (const irange &r) { dump_flags_t m_flags = dump_flags; dump_flags &= ~TDF_DETAILS; - irange::intersect (&r); + irange::legacy_verbose_intersect (&r); dump_flags = m_flags; } diff --git a/gcc/vr-values.cc b/gcc/vr-values.cc index 122586fbcc8..301996d2134 100644 --- a/gcc/vr-values.cc +++ b/gcc/vr-values.cc @@ -266,7 +266,7 @@ vr_values::update_value_range (const_tree var, value_range_equiv *new_vr) value_range_equiv nr; get_global_range_query ()->range_of_expr (nr, const_cast (var)); if (!nr.undefined_p ()) - new_vr->intersect (&nr); + new_vr->legacy_verbose_intersect (&nr); } /* Update the value range, if necessary. If we cannot allocate a lattice @@ -750,7 +750,7 @@ vr_values::extract_range_for_var_from_comparison_expr (tree var, gcc_unreachable (); /* Finally intersect the new range with what we already know about var. */ - vr_p->intersect (get_value_range (var)); + vr_p->legacy_verbose_intersect (get_value_range (var)); } /* Extract value range information from an ASSERT_EXPR EXPR and store @@ -1014,7 +1014,7 @@ vr_values::extract_range_from_cond_expr (value_range_equiv *vr, gassign *stmt) /* The resulting value range is the union of the operand ranges */ vr->deep_copy (vr0); - vr->union_ (vr1); + vr->legacy_verbose_union_ (vr1); } @@ -2300,10 +2300,10 @@ simplify_using_ranges::vrp_evaluate_conditional_warnv_with_ops for previously LE_ or LT_EXPR and GT_EXPR otherwise, but the comments next to the enclosing if suggest it's not generally profitable to do so. */ - vro.intersect (vr0); + vro.legacy_verbose_intersect (vr0); if (vro.undefined_p ()) return boolean_false_node; - vri.intersect (vr0); + vri.legacy_verbose_intersect (vr0); if (vri.undefined_p ()) return boolean_true_node; } @@ -2803,7 +2803,7 @@ vr_values::extract_range_from_phi_node (gphi *phi, if (first) vr_result->deep_copy (vr_arg); else - vr_result->union_ (vr_arg); + vr_result->legacy_verbose_union_ (vr_arg); first = false; if (vr_result->varying_p ())