From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by sourceware.org (Postfix) with ESMTPS id 72A753858430 for ; Thu, 9 May 2024 22:35:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 72A753858430 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=localhost.redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 72A753858430 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=207.211.30.44 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715294203; cv=none; b=ZKFbvVI6cxkFrI0jOte3/9uS0K0SyqbYmN7aWB/ybBYEYuVQDu3AW4YwTuCCh8IMTjLRaLrl9F2LCRySX7ykNMX1QcgUsKZV9nCZ7ln4EBmnmDDl8sdc3oHVIUqlWmtoSRw1uO6DyYE6m1zoevpOupapD2Sn4bmueuUjdhbTuM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715294203; c=relaxed/simple; bh=ZG7PVSzYYkEW2woQ0Axmxjp3mDc0BGszc9xgw+lwH4s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=LYzrPLh58y2v9AtjNXNfXCgjGq5VYDm/KGnnF6FU4cVRfEqYFqa6dxEBDqAGV8jf5IvE+BQ0hUj5/1AOuwqQnFPbyEJf9Sq3PWIvHupAWHax2GE4c+Rpy6zgFaJiHp0FNexW0CqGfIYZIOjSnEG83Rn4VIpmeGE+sWkvtxMOxf4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715294120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQKnfNnJffA6SFOv40MkwaW0tSoA8ElmVsDvhUvgO4A=; b=JBohxwdmUfjTmrWvRL9T0vRH0EoVKuDcy00km2sEYvUlWIlYBklnEEZ18JqXH3FEaLxky6 ajl9oj/7lvsH48iGP8KdJtAfoJpdPE/+GYjg/5xVtjXFCli5UnwAL9+6BZFJ5o0zkwIK01 b4HW7tkTO7h/lW5LXSW92TKU7IPmizo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-575-xav8jSXaP0mZ8Mf0-K6Ibw-1; Thu, 09 May 2024 18:35:19 -0400 X-MC-Unique: xav8jSXaP0mZ8Mf0-K6Ibw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1CA3E800206 for ; Thu, 9 May 2024 22:35:19 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C16EC51902F; Thu, 9 May 2024 22:35:18 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.18.1/8.17.1) with ESMTPS id 449MZBCd340804 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 10 May 2024 00:35:11 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.18.1/8.18.1/Submit) id 449MZBls340803; Fri, 10 May 2024 00:35:11 +0200 From: Aldy Hernandez To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Revert: "Enable prange support." [PR114985] Date: Fri, 10 May 2024 00:34:56 +0200 Message-ID: <20240509223509.340776-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=WINDOWS-1252; x-default=true X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This reverts commit 36e877996936abd8bd08f8b1d983c8d1023a5842 until the IPA pass is fixed with regards to POINTER =3D POINTER POINTER. --- gcc/gimple-range-cache.cc | 4 ++-- gcc/gimple-range-fold.cc | 4 ++-- gcc/gimple-range-fold.h | 2 +- gcc/gimple-range-infer.cc | 2 +- gcc/gimple-range-op.cc | 2 +- gcc/gimple-range-path.cc | 2 +- gcc/gimple-ssa-warn-access.cc | 2 +- gcc/ipa-cp.h | 2 +- gcc/range-op-ptr.cc | 4 ++++ gcc/range-op.cc | 18 ++++++++++++++---- gcc/tree-ssa-structalias.cc | 2 +- gcc/value-range.cc | 1 - gcc/value-range.h | 4 ++-- 13 files changed, 31 insertions(+), 18 deletions(-) diff --git a/gcc/gimple-range-cache.cc b/gcc/gimple-range-cache.cc index bdd2832873a..72ac2552311 100644 --- a/gcc/gimple-range-cache.cc +++ b/gcc/gimple-range-cache.cc @@ -274,10 +274,10 @@ sbr_sparse_bitmap::sbr_sparse_bitmap (tree t, vrange_= allocator *allocator, // Pre-cache zero and non-zero values for pointers. if (POINTER_TYPE_P (t)) { - prange nonzero; + int_range<2> nonzero; nonzero.set_nonzero (t); m_range[1] =3D m_range_allocator->clone (nonzero); - prange zero; + int_range<2> zero; zero.set_zero (t); m_range[2] =3D m_range_allocator->clone (zero); } diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index a9c8c4d03e6..9c4ad1ee7b9 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -597,7 +597,7 @@ fold_using_range::fold_stmt (vrange &r, gimple *s, fur_= source &src, tree name) // Process addresses. if (gimple_code (s) =3D=3D GIMPLE_ASSIGN && gimple_assign_rhs_code (s) =3D=3D ADDR_EXPR) - return range_of_address (as_a (r), s, src); + return range_of_address (as_a (r), s, src); =20 gimple_range_op_handler handler (s); if (handler) @@ -757,7 +757,7 @@ fold_using_range::range_of_range_op (vrange &r, // If a range cannot be calculated, set it to VARYING and return true. =20 bool -fold_using_range::range_of_address (prange &r, gimple *stmt, fur_source &s= rc) +fold_using_range::range_of_address (irange &r, gimple *stmt, fur_source &s= rc) { gcc_checking_assert (gimple_code (stmt) =3D=3D GIMPLE_ASSIGN); gcc_checking_assert (gimple_assign_rhs_code (stmt) =3D=3D ADDR_EXPR); diff --git a/gcc/gimple-range-fold.h b/gcc/gimple-range-fold.h index c7c599bfc93..7cbe15d05e5 100644 --- a/gcc/gimple-range-fold.h +++ b/gcc/gimple-range-fold.h @@ -157,7 +157,7 @@ protected: =09=09=09 fur_source &src); bool range_of_call (vrange &r, gcall *call, fur_source &src); bool range_of_cond_expr (vrange &r, gassign* cond, fur_source &src); - bool range_of_address (prange &r, gimple *s, fur_source &src); + bool range_of_address (irange &r, gimple *s, fur_source &src); bool range_of_phi (vrange &r, gphi *phi, fur_source &src); void range_of_ssa_name_with_loop_info (vrange &, tree, class loop *, gph= i *, =09=09=09=09=09 fur_source &src); diff --git a/gcc/gimple-range-infer.cc b/gcc/gimple-range-infer.cc index d5e1aa14275..c8e8b9b60ac 100644 --- a/gcc/gimple-range-infer.cc +++ b/gcc/gimple-range-infer.cc @@ -123,7 +123,7 @@ gimple_infer_range::add_nonzero (tree name) { if (!gimple_range_ssa_p (name)) return; - prange nz; + int_range<2> nz; nz.set_nonzero (TREE_TYPE (name)); add_range (name, nz); } diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index ddd13ec5594..55dfbb23ce2 100644 --- a/gcc/gimple-range-op.cc +++ b/gcc/gimple-range-op.cc @@ -1120,7 +1120,7 @@ class cfn_strlen : public range_operator { public: using range_operator::fold_range; - virtual bool fold_range (irange &r, tree type, const prange &, + virtual bool fold_range (irange &r, tree type, const irange &, =09=09=09 const irange &, relation_trio) const { wide_int max =3D irange_val_max (ptrdiff_type_node); diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc index f1a12f76144..96c6ac6b6a5 100644 --- a/gcc/gimple-range-path.cc +++ b/gcc/gimple-range-path.cc @@ -443,7 +443,7 @@ path_range_query::compute_ranges_in_block (basic_block = bb) void path_range_query::adjust_for_non_null_uses (basic_block bb) { - prange r; + int_range_max r; bitmap_iterator bi; unsigned i; =20 diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc index 0cd5b6d6ef4..2c10d19e7f3 100644 --- a/gcc/gimple-ssa-warn-access.cc +++ b/gcc/gimple-ssa-warn-access.cc @@ -4213,7 +4213,7 @@ pass_waccess::check_pointer_uses (gimple *stmt, tree = ptr, =09=09 where the realloc call is known to have failed are valid. =09=09 Ignore pointers that nothing is known about. Those could =09=09 have escaped along with their nullness. */ -=09 prange vr; +=09 value_range vr; =09 if (m_ptr_qry.rvals->range_of_expr (vr, realloc_lhs, use_stmt)) =09=09{ =09=09 if (vr.zero_p ()) diff --git a/gcc/ipa-cp.h b/gcc/ipa-cp.h index e62a09f38af..abeaaa4053e 100644 --- a/gcc/ipa-cp.h +++ b/gcc/ipa-cp.h @@ -296,7 +296,7 @@ bool values_equal_for_ipcp_p (tree x, tree y); static inline bool ipa_supports_p (tree type) { - return irange::supports_p (type) || prange::supports_p (type); + return irange::supports_p (type); } =20 #endif /* IPA_CP_H */ diff --git a/gcc/range-op-ptr.cc b/gcc/range-op-ptr.cc index 4d5cbda764c..466edc6bf74 100644 --- a/gcc/range-op-ptr.cc +++ b/gcc/range-op-ptr.cc @@ -1968,4 +1968,8 @@ range_op_table::initialize_pointer_ops () { set (POINTER_PLUS_EXPR, op_pointer_plus); set (POINTER_DIFF_EXPR, op_pointer_diff); + set (BIT_AND_EXPR, op_hybrid_and); + set (BIT_IOR_EXPR, op_hybrid_or); + set (MIN_EXPR, op_hybrid_min); + set (MAX_EXPR, op_hybrid_max); } diff --git a/gcc/range-op.cc b/gcc/range-op.cc index e00136479a6..a134af68141 100644 --- a/gcc/range-op.cc +++ b/gcc/range-op.cc @@ -102,13 +102,23 @@ range_op_table::range_op_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 implementation. set (ADDR_EXPR, op_addr); set (BIT_NOT_EXPR, op_bitwise_not); set (BIT_XOR_EXPR, op_bitwise_xor); - set (BIT_AND_EXPR, op_bitwise_and); - set (BIT_IOR_EXPR, op_bitwise_or); - set (MIN_EXPR, op_min); - set (MAX_EXPR, op_max); + + // These are in both integer and pointer tables, but pointer has a diffe= rent + // implementation. + // If commented out, there is a hybrid version in range-op-ptr.cc which + // is used until there is a pointer range class. Then we can simply + // uncomment the operator here and use the unified version. + + // set (BIT_AND_EXPR, op_bitwise_and); + // set (BIT_IOR_EXPR, op_bitwise_or); + // set (MIN_EXPR, op_min); + // set (MAX_EXPR, op_max); } =20 // Instantiate a default range operator for opcodes with no entry. diff --git a/gcc/tree-ssa-structalias.cc b/gcc/tree-ssa-structalias.cc index bb59c6a7c02..9c63305063c 100644 --- a/gcc/tree-ssa-structalias.cc +++ b/gcc/tree-ssa-structalias.cc @@ -6833,7 +6833,7 @@ find_what_p_points_to (tree fndecl, tree p) struct ptr_info_def *pi; tree lookup_p =3D p; varinfo_t vi; - prange vr; + value_range vr; get_range_query (DECL_STRUCT_FUNCTION (fndecl))->range_of_expr (vr, p); bool nonnull =3D vr.nonzero_p (); =20 diff --git a/gcc/value-range.cc b/gcc/value-range.cc index ada941bf3b5..3e1ecf69517 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -1518,7 +1518,6 @@ irange::verify_range () gcc_checking_assert (m_num_ranges =3D=3D 0); return; } - gcc_checking_assert (supports_p (type ())); gcc_checking_assert (m_num_ranges <=3D m_max_ranges); =20 // Legacy allowed these to represent VARYING for unknown types. diff --git a/gcc/value-range.h b/gcc/value-range.h index 44cdbd717f4..37ce91dc52d 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -994,7 +994,7 @@ irange::varying_compatible_p () const const wide_int &u =3D m_base[1]; tree t =3D m_type; =20 - if (m_kind =3D=3D VR_VARYING) + if (m_kind =3D=3D VR_VARYING && t =3D=3D error_mark_node) return true; =20 unsigned prec =3D TYPE_PRECISION (t); @@ -1039,7 +1039,7 @@ irange::nonzero_p () const inline bool irange::supports_p (const_tree type) { - return INTEGRAL_TYPE_P (type); + return INTEGRAL_TYPE_P (type) || POINTER_TYPE_P (type); } =20 inline bool --=20 2.45.0