From patchwork Thu Oct 24 12:53:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 99484 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 AF9F63858405 for ; Thu, 24 Oct 2024 12:54:09 +0000 (GMT) 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.133.124]) by sourceware.org (Postfix) with ESMTP id 1E5DB3858C98 for ; Thu, 24 Oct 2024 12:53:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E5DB3858C98 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1E5DB3858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774409; cv=none; b=XTBenRn3DVZ/duvd73b6A299hBlih22BZLEqozNAlUIKj+2Ccb7VzenijB74vBIl2scAGcVIaSBvz70sUMKzodWMlaTMSkmZUPrdRA2pahpVgNB/1zoxeNUI1iY6qEwlYD999yffxFYPE8c1yk1vIuCC6LzVTfNjacBLh5WYuhM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774409; c=relaxed/simple; bh=Oc+USvmpbolsWk7KRnNOjG7WakoHcR0UyJbR+rqQFxk=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=WPp0+H6XxwguSr0DJa0/szYDyb74gFxZjP2BZnGspzRRKUMXQGfGoii02OGA+Epwopoait2kAztdVjyxWOmw134+EW8dZqkXY53wP0g7DP78vFBfDrFE11Qi5CB4p2SPKQJMZn80d73xIbqnahDlV1U+wZwvTo/g+uQzrYdyjS0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729774405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=ouKeK6zvcf7y9yVrJa5So6/UzG/xiBC6ukavn/YkhWs=; b=BrXVwL253KtNTtI2u+lVyMpbLQ+mn1rvCEaAvA8u+N3v53rClqbJcGw1SnzdS1w/aIpyJW pv0wj4v1GREfv80bTWpR8XV42U/riMVBks5HHL5lmqTH9S58bpUBf1d6ZqjKluTs+59H+y 7V5+CdUHdnKjOxKOUiV1pkkZBF8uApc= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-286-IzoWObmdPLCV6Ij94uoC7g-1; Thu, 24 Oct 2024 08:53:24 -0400 X-MC-Unique: IzoWObmdPLCV6Ij94uoC7g-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6cbe4fc0aa7so11586116d6.0 for ; Thu, 24 Oct 2024 05:53:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729774403; x=1730379203; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ss/yH7FYtjCzasNGELWyyH+tsenOBHOIGsY38oN022I=; b=SEjVj1lmX0xmExvQ+yzht6npg4KlNBeKLMKsHHv61fmL7zi3z6bWJ5ZUe6qLS1Sy8+ 70WRuWMksy1YRHFqakgRdYQ6oYZERIAsBklMmkcwy8gKNSIxm1tXwai3Q/4Wt9gY7Em0 ZcKjr8v6zHg3matoxNgh80AVjbv0/VFNz5xSXDzCW4oR5LzvsU5mfikqEnPia8bOkvcO zCe4aA81u3MwRepZdEHZt/ZTyC7Q5q/84d+09Dw/lx1iA8p5nuD04PWfOJdRzBfL4+qn mF1TJ3YISV49kDC8GaLLBwl6+5ay2bhcs2h2AHqwqAvqHBO3zdidwkxZRat+BZESVY4z xlXw== X-Gm-Message-State: AOJu0Yx+srhsDK24KcGMdA7uMGzF97nigzONz74MZqVgbP67yD/wTkTz MFVttQN/Pr1wY2a904dXKJdN/H66Od51DMUjeBDWQnv6RYcZ2s+JTfUplQR9BJjgA6GcGlc+AX7 /tPPfVUfqqlrebqRVdYG2FbbJTof6k1i161XebWEdtxuWanUMqE88rdFKoiOmrYLn+D7DKocgZX VHZwpElZpE3SFsH3ID6c9ixBRyz5DcVYp0F9wiohS3yA== X-Received: by 2002:a05:6214:4489:b0:6cb:4b70:8ead with SMTP id 6a1803df08f44-6ce342864famr78297436d6.37.1729774403571; Thu, 24 Oct 2024 05:53:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHH0FtrovzVvNTFi6l0d99Egfx+pFKlgQVORsUbpYP6V56/c+KFZuuJ1600jZHgfS7I/C1hNw== X-Received: by 2002:a05:6214:4489:b0:6cb:4b70:8ead with SMTP id 6a1803df08f44-6ce342864famr78297186d6.37.1729774403111; Thu, 24 Oct 2024 05:53:23 -0700 (PDT) Received: from [192.168.0.174] ([104.219.121.80]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6ce00999a91sm49292466d6.88.2024.10.24.05.53.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Oct 2024 05:53:21 -0700 (PDT) Message-ID: Date: Thu, 24 Oct 2024 08:53:20 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: gcc-patches , aldy@quesejoda.com From: Andrew MacLeod Subject: [COMMITTED 1/4] - Cleanup pointer_plus_operator. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.5 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org when looking at 117222, I discovered the prange operators need a bit of auditing. pointer_plus should be functioning properly, but there were some pre-Prange remnants hanging around.. there were wide_int and irange based routines which can no longer be called, so they are dead code and this removed them. Bootstraps on x86_64-pc-linux-gnu with no regressions.  pushed. Andrew From 4eb25bfee859a9161c0fd48215feaf1c307f2480 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Mon, 21 Oct 2024 16:47:32 -0400 Subject: [PATCH 1/4] Cleanup pointer_plus_operator. The POINTER_PLUS operator still carries some remnamts of the old irange interface, which is now dead code with prange. * range-op-ptr.cc (pointer_plus_operator::wi_fold): Remove. (pointer_plus_operator::op2_range): Remove irange variant. (pointer_plus_operator::update_bitmask): Likewise. --- gcc/range-op-ptr.cc | 74 +-------------------------------------------- 1 file changed, 1 insertion(+), 73 deletions(-) diff --git a/gcc/range-op-ptr.cc b/gcc/range-op-ptr.cc index 07a551618f9..4f4b2cf6bab 100644 --- a/gcc/range-op-ptr.cc +++ b/gcc/range-op-ptr.cc @@ -302,16 +302,7 @@ public: const prange &lhs, const prange &op1, relation_trio = TRIO_VARYING) const final override; - 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; - virtual bool op2_range (irange &r, tree type, - const irange &lhs, - const irange &op1, - relation_trio = TRIO_VARYING) const; - void update_bitmask (irange &r, const irange &lh, const irange &rh) const + void update_bitmask (prange &r, const prange &lh, const irange &rh) const { update_known_bitmask (r, POINTER_PLUS_EXPR, lh, rh); } } op_pointer_plus; @@ -388,69 +379,6 @@ pointer_plus_operator::op2_range (irange &r, tree type, return true; } -void -pointer_plus_operator::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 -{ - // Check for [0,0] + const, and simply return the const. - if (lh_lb == 0 && lh_ub == 0 && rh_lb == rh_ub) - { - r.set (type, rh_lb, rh_lb); - return; - } - - // For pointer types, we are really only interested in asserting - // whether the expression evaluates to non-NULL. - // - // With -fno-delete-null-pointer-checks we need to be more - // conservative. As some object might reside at address 0, - // then some offset could be added to it and the same offset - // subtracted again and the result would be NULL. - // E.g. - // static int a[12]; where &a[0] is NULL and - // ptr = &a[6]; - // ptr -= 6; - // ptr will be NULL here, even when there is POINTER_PLUS_EXPR - // where the first range doesn't include zero and the second one - // doesn't either. As the second operand is sizetype (unsigned), - // consider all ranges where the MSB could be set as possible - // subtractions where the result might be NULL. - if ((!wi_includes_zero_p (type, lh_lb, lh_ub) - || !wi_includes_zero_p (type, rh_lb, rh_ub)) - && !TYPE_OVERFLOW_WRAPS (type) - && (flag_delete_null_pointer_checks - || !wi::sign_mask (rh_ub))) - r.set_nonzero (type); - else if (lh_lb == lh_ub && lh_lb == 0 - && rh_lb == rh_ub && rh_lb == 0) - r.set_zero (type); - else - r.set_varying (type); -} - -bool -pointer_plus_operator::op2_range (irange &r, tree type, - const irange &lhs ATTRIBUTE_UNUSED, - const irange &op1 ATTRIBUTE_UNUSED, - relation_trio trio) const -{ - relation_kind rel = trio.lhs_op1 (); - r.set_varying (type); - - // If the LHS and OP1 are equal, the op2 must be zero. - if (rel == VREL_EQ) - r.set_zero (type); - // If the LHS and OP1 are not equal, the offset must be non-zero. - else if (rel == VREL_NE) - r.set_nonzero (type); - else - return false; - return true; -} - class pointer_min_max_operator : public range_operator { public: -- 2.45.0 From patchwork Thu Oct 24 12:53:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 99485 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 69C50385840F for ; Thu, 24 Oct 2024 12:54:18 +0000 (GMT) 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.133.124]) by sourceware.org (Postfix) with ESMTP id 564C53858D35 for ; Thu, 24 Oct 2024 12:53:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 564C53858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 564C53858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774424; cv=none; b=KIv4TcadpbtA9KXxSqWEAvmZBcfHgPikh7UozM7W8i4lYh7PoCn/6q0ophi91U0DSmjOY5MXfT+UrHBVUuiLzPZw+p99IFQo68MCFOsDaFic7yKVAhF++30x5vRyQsvhteoqdTBUfWN0Uz+Gjerl6Hsx4fXN9OtAS9x4xdKyZ+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774424; c=relaxed/simple; bh=tNiN9U1PPMvY+SQZRFRMLRXMURWy/CZN7IaU4VlRRYQ=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=BF53UslBmbnoOlJ7k4AVsdvx9HvJDRC9By7R+Fd4SA4DlI56Oke4Ntz/404y73BlLB8ZrBfkIgL4es43P5cJZd09/3CKfmFuu/V+miTXL7fAnFb8QkqtuktpMJtzwjvhv7ix9Nush1smW4B8zj8PlGYkKWdhqWSchz/gD3t2n/E= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729774417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=uKlcLXiINojxzvZag0iCTi1VRC7u30nUQpEJI7fVBLg=; b=GlY0wGt6BFmXPICMjdn0Fgy16l7Hh4kZZ9QknsN+ESleZDRhms7ajisXV7/QFlP0fUqx6u Gh+J4I4kyj5r6JGNtNqZTMq8HGedxfNCpuDNDfuCQ878viX8jHp05tDwMAZ2jSXSZzLElI uEv+ZGYeIXxxhsBVdS1JV6/vlYHglqE= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-344-koqMELN3PmqrtrzqTy2XNg-1; Thu, 24 Oct 2024 08:53:35 -0400 X-MC-Unique: koqMELN3PmqrtrzqTy2XNg-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7b14073eabdso120146085a.3 for ; Thu, 24 Oct 2024 05:53:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729774414; x=1730379214; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0eA4j2MDJW0zC0wiNWVXcRjENOg2DNbrLHh8ou3ytHI=; b=LWGqQewqTGWo4xc0DIavEB91IzaA+6HhS7mhIKnyxASXsLpLfvsGWi43dFWJiX4Ept gvQ33KZPS9oM5HUbE0iA56ePUkHVL8W15bkjqp9FumLrTZrau+J1RZYtNf+3ErAoKmVD HbTBaJtheZO9R81bpn4Z75/SLBmzsR6N+kF/+55VDvqQPpmFEazgt9jcSb7CB8qqBqtV jdBps/DYsVACnAWg1pOjwyh/nFv7pjRJalpoGp8r6S7YW0UQv4j2Eq1s94y4xrOrnWpZ 1RDjpEFZvjW34pHrwnGa0t+jLq06SwrGvDEjP/T4N59z2P3m719iX7qVh8M0FACikEa4 IfFg== X-Gm-Message-State: AOJu0YxKkNFVJnHG2EwtRaltBNXFJFa6A7YrUikMCueHaDEtdnVwvxw+ OXu5NQFPJ0GmOLu2oUcNZqYwy+5vfZubg3S6hsDPoLeVaMbCY8Pmep7QgLgsmqaB5A0CdtDqH1z BNy540kbYa2dbuikZwwpgBAHiosi6vXiN/P/9cs6ypqJqXjLm+EOVwIrxUeC1SyCZnqA8qqOgz3 ZYCdEA8QG2ZJBFTv8ttWZh3wBas/FhyaXXrJuitI4SwA== X-Received: by 2002:a05:620a:3193:b0:7b1:11d9:446e with SMTP id af79cd13be357-7b17e54075fmr680577485a.3.1729774414630; Thu, 24 Oct 2024 05:53:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYUjoyf8Wp1Ajhm7WGLXeVgWbp4tYwT4Y9VtQrfUZdqO7cZixSoJqd5MG1nNIvq2Y1O8im9g== X-Received: by 2002:a05:620a:3193:b0:7b1:11d9:446e with SMTP id af79cd13be357-7b17e54075fmr680574185a.3.1729774414059; Thu, 24 Oct 2024 05:53:34 -0700 (PDT) Received: from [192.168.0.174] ([104.219.121.80]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b165a78a56sm483101585a.112.2024.10.24.05.53.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Oct 2024 05:53:33 -0700 (PDT) Message-ID: Date: Thu, 24 Oct 2024 08:53:31 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: gcc-patches , aldy@quesejoda.com From: Andrew MacLeod Subject: [COMMITTED 2/4] - Remove pointer_min_max_operator. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.5 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Similarly, the class pointer_min_max_operator was used back when it was shared with irange.  With prange, these operations are performed via bool operator_min::fold_range (prange &r, tree type, const prange &op1, const prange &op2, relation_trio) const   and bool operator_max::fold_range (prange &r, tree type, const prange &op1, const prange &op2, relation_trio) const This patch removes the unused clas to avoid confusion. Bootstraps on x86_64-pc-linux-gnu with no regressions.  pushed. Andrew From b6e18f91e75a28e16b4fa117d8275ab146acbb01 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Mon, 21 Oct 2024 18:11:43 -0400 Subject: [PATCH 2/4] Remove pointer_min_max_operator. The pointer_min_max_operator class was used before the current dispatch system was created. These operations have been transferred to operator_min::fold_range () and operator_max::fold_range () with prange operands. This class is no longer used for anything, delete it. * range-op-ptr.cc (class pointer_min_max_operator): Remove. (pointer_min_max_operator::wi_fold): Remove. --- gcc/range-op-ptr.cc | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/gcc/range-op-ptr.cc b/gcc/range-op-ptr.cc index 4f4b2cf6bab..f8ce62d5719 100644 --- a/gcc/range-op-ptr.cc +++ b/gcc/range-op-ptr.cc @@ -379,34 +379,6 @@ pointer_plus_operator::op2_range (irange &r, tree type, return true; } -class pointer_min_max_operator : public range_operator -{ -public: - 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; -} op_ptr_min_max; - -void -pointer_min_max_operator::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 -{ - // For MIN/MAX expressions with pointers, we only care about - // nullness. If both are non null, then the result is nonnull. - // If both are null, then the result is null. Otherwise they - // are varying. - if (!wi_includes_zero_p (type, lh_lb, lh_ub) - && !wi_includes_zero_p (type, rh_lb, rh_ub)) - r.set_nonzero (type); - else if (wi_zero_p (type, lh_lb, lh_ub) && wi_zero_p (type, rh_lb, rh_ub)) - r.set_zero (type); - else - r.set_varying (type); -} - class pointer_and_operator : public range_operator { public: -- 2.45.0 From patchwork Thu Oct 24 12:53:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 99486 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 59B473858D35 for ; Thu, 24 Oct 2024 12:55:18 +0000 (GMT) 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.133.124]) by sourceware.org (Postfix) with ESMTP id 0C1CE3858C56 for ; Thu, 24 Oct 2024 12:53:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0C1CE3858C56 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0C1CE3858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774428; cv=none; b=yFUFNBzn0PeLRJ/3TF2QJ+445N7EPYGWrgbqlsjrHlOerUzWpGIZpfWds0ptwuiC48uRNOepoaLVAWI9uVq9/ulZxl5RDHp5NaY8pEyQ/Xr1sabtyxDwAB+SWlGBi9i2FJ+faj/UvbG5naV+QuWaEOUWOoNLPoN1L+7G3orfoJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774428; c=relaxed/simple; bh=u2ShZmpZT2Cr8/fOtVjBPI9l7ohU97QIGW+Er1iVu2o=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=NxMejvncxCpuRLklseTniaS/fRIRmWIVXHbxTQa2g8zqX3c50NgXW0MvXLqE2XBjEngLQgUQ1WrUcPi2JQznoFAThUN9qffB0WgNamMCyjTudH5ZkC3rY6W1Sdc3V4V5fkr7A/Y2yGBcyCgNQzWDE+wNcUEZqElxclUkoU27vHQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729774426; 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; bh=CSdML0eeNQReCbSIT+tK1rRaARO76CAEoHbQRFExK4g=; b=CHm2/sXltRD7yHOF88B25Ewx5g4IfdMBZyNV5hDNn0IuWDNTX1k6x8+PmIVms9fSTlbYzm jR9hXk7SO2GMoI4rQBiIA8wKmc+0YKnAdjI/OeRbvyGgGzl+8Ykr7AM2i1648r9gn3MBaw pt4fdYO5X1QF5cwCljIDXk/Z4gUvS6M= Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-206-qjb7VXqRPRKqKxpQYhGbuQ-1; Thu, 24 Oct 2024 08:53:45 -0400 X-MC-Unique: qjb7VXqRPRKqKxpQYhGbuQ-1 Received: by mail-oo1-f69.google.com with SMTP id 006d021491bc7-5ebb6b362f2so656536eaf.1 for ; Thu, 24 Oct 2024 05:53:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729774423; x=1730379223; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dxjQKcv4zwLH10RcoZTDDEq+vjwIHWjThzV2tc4aFXo=; b=MFEeMxhqGxYGTq/PWNHGPGvF8SC9ljmbTBV3fjTr6NVvZh5HJfLTmXa5XF0EPWseAL PPzI7FCuVNsTZrAo54ocpmXlYuw4Pf4SsmXTvI8GhcRpaLm5rYuUPG1u4Z9TouKdmCDA DDiavxNVDSfUD7veNF297nYkxJ+9o7Xx4Hde9C453OgqQgtQGwwOIX6Cmz7/teNKVNAB LmzffhywZyyfzyq3v4pucHeC8bghCYp6QrRiAMBXvwsllsK+eXCnbzms+d3UBu2lSpkD GqkYbpVtf1JOUmF1pKr68nvEjntrDtcg22oooVThRboJAdoQrypjMQ93+o6NRMJLtMYb 9H+g== X-Gm-Message-State: AOJu0Yznxy1VHKKhV89w1H8/aX1y4lbCq29j8yzNtVPHmnwyU4s5ZScG P/OUWdnx5UUJauEo/Qs3VX0s6vMWQ4qExsHfk4kMJLisVQTA3ctlaH2/pONzwFrUIFgQ51H6gjD 90P+DCLteeSqf8g4iWWMXrHzjfXlxXISnSPKdJY+fY7dzCPlVwQEcuLG1b52QhHESMKiECE2qL3 3gU6QGaVdsNqyL/q4OgiINA6t92O/q0P1DPPXreUt16w== X-Received: by 2002:a05:6358:938c:b0:1c3:77f0:362 with SMTP id e5c5f4694b2df-1c3d81c2f78mr373895755d.25.1729774423744; Thu, 24 Oct 2024 05:53:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGo0CYtsTc88AZKHoRlhTJ9Gi8siU8U051rMt1blm64Yt9elxq4/PfTjgwG+1Zh5nS2qsMNUw== X-Received: by 2002:a05:6358:938c:b0:1c3:77f0:362 with SMTP id e5c5f4694b2df-1c3d81c2f78mr373893455d.25.1729774423327; Thu, 24 Oct 2024 05:53:43 -0700 (PDT) Received: from [192.168.0.174] ([104.219.121.80]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b165a72ca1sm480821985a.100.2024.10.24.05.53.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Oct 2024 05:53:42 -0700 (PDT) Message-ID: <69832a6a-2576-4b37-bb8f-b958c48f8fb8@redhat.com> Date: Thu, 24 Oct 2024 08:53:41 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: gcc-patches Cc: aldy@quesejoda.com From: Andrew MacLeod Subject: [COMMITTED 3/4] Remove pointer_and_operator. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.5 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Similarly, operator_bitwise_and::fold_range with prange arguments supercedes  the pointer_and_operator class, so this patch removes the class to avod any confusion. Bootstraps on x86_64-pc-linux-gnu with no regressions.  pushed. Andrew From afd6732de031e42fb54904d478d7c5a1663fc711 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Mon, 21 Oct 2024 18:20:10 -0400 Subject: [PATCH 3/4] Remove pointer_and_operator. This operator class predates the dispatch system, and is no longer used. The functionality of wi_fold has been replaced by operator_bitwise_and::fold_range with prange operaands. * range-op-ptr.cc (class pointer_and_operator): Remove. (pointer_and_operator::wi_fold): Remove. --- gcc/range-op-ptr.cc | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/gcc/range-op-ptr.cc b/gcc/range-op-ptr.cc index f8ce62d5719..dd312a80366 100644 --- a/gcc/range-op-ptr.cc +++ b/gcc/range-op-ptr.cc @@ -379,29 +379,6 @@ pointer_plus_operator::op2_range (irange &r, tree type, return true; } -class pointer_and_operator : public range_operator -{ -public: - 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; -} op_pointer_and; - -void -pointer_and_operator::wi_fold (irange &r, tree type, - const wide_int &lh_lb, - const wide_int &lh_ub, - const wide_int &rh_lb ATTRIBUTE_UNUSED, - const wide_int &rh_ub ATTRIBUTE_UNUSED) const -{ - // For pointer types, we are really only interested in asserting - // whether the expression evaluates to non-NULL. - if (wi_zero_p (type, lh_lb, lh_ub) || wi_zero_p (type, lh_lb, lh_ub)) - r.set_zero (type); - else - r.set_varying (type); -} - class pointer_or_operator : public range_operator { -- 2.45.0 From patchwork Thu Oct 24 12:53:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 99487 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 85ACB3858C41 for ; Thu, 24 Oct 2024 12:55:21 +0000 (GMT) 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.133.124]) by sourceware.org (Postfix) with ESMTP id EE8493858D28 for ; Thu, 24 Oct 2024 12:53:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EE8493858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EE8493858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774440; cv=none; b=cREuePHz6iEJ/F2XbQKDqme5FS72hE3sEsNK6BEDLuY2yiXIkp9hBN4IYVyzHlgo8+q3Eu8HQPMpUp1+eI1sTTrGhyBGXViAt0hpl2x5omLxy5mtaPAYmBCiojIqqhXg9fU5DtXW4NgCbDXs9Xfgc4AqUN+IDz3Kee7ti+w1IU4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729774440; c=relaxed/simple; bh=4FScQaywZkX0ZN09KSeHXU+l9xPVKSwS3EOwjuRab7w=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=BMVuyTMiXQZgqhV2CRv0pxxaMAGQYwgrXs68fAQMbyFHBDmv80dDEsURJOjt9QShJyqllcGfQzFfiy09GJs64I+yXAGCQwo3sd1PvvMk+Iri5uZw9vRxVxHr3iM1s/hMlcsuCHVKTPbXQ0o1C8nOKocgBfXYpuunRf/UovzspB8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729774434; 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; bh=Y06Olub5qtCm3BuViCbmr1FktDf2UR1Dj3tl0Qu7QXY=; b=BugjnaWhBUZuUzvlPrsXtFZoQ4x+YdoClwtD2laO5SSG5wsmeMbSpuzL8rkWtEIV0Umy4q WMNR/FEdoCFWPtJthX+ARXLj2iTJBSDEDt5uyFVdLsfo+LnfsyC+4uLnUYHrnJ85h9QI5b CRlAQTbCtWLLYKy2Y7Bv3LoSQDy5FU4= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-608-XZFcm40WOLe37ufx8nmEbw-1; Thu, 24 Oct 2024 08:53:53 -0400 X-MC-Unique: XZFcm40WOLe37ufx8nmEbw-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-460c6731ebeso16155931cf.0 for ; Thu, 24 Oct 2024 05:53:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729774432; x=1730379232; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VBDB8Qf207lk45iqN8/J8qPdhPjqgGg7APvofF64zLk=; b=o3Nq2++zt/q1TLF650IzZShZz2KWvd1RCAXBPv5zRmEaiF3mLGeztOmHkiAbHpZ2bu SqyvBm1fC6Ri9FJ3gbTBh1ACZP9dD5ypNFNgVpEzBYZ3jnXMhp7CAA9VHlnUFpiKEnr4 AMKYx29sjkdmlmFLdjJd4Dg3y6KavCjM7SPz8Ezdrj14to/eYXN/KCcWh2mJT3S01w4G +cV5Roe5J9Z8Gprisouc0efdDqOVmkI67/YyzRgxAXnVFAPwzlzzAUJoL2PLqPhFbQXe BqFQLEamxdNU0mIvm2CM0sYgREv6vIBfriX/Wz/JgNfdEoGNW2cdadq7IFkHtYsQwv/2 oS8Q== X-Gm-Message-State: AOJu0YxFZfK1JR125i646wrucp+AgtTtTxl13h4B5pl81tYHixrd1uWP Kf+HzD2TqXfP/nBvzF1j8f/DpBnSER1DuyqfMzwxOib+9AfqG33/M5mIdCOQSRNOWjzOV1rit1v pdmCNhsTDCtTQrjdz5J+FV/herBUPK80Ul1uNW3nwMij9n6xceqy6p92mm0ZbvLyMC2OStcSc82 L7SpXmULAQQyvMRGjrYZija1205E4U8vaT06ZDMEoQdQ== X-Received: by 2002:a05:622a:3ce:b0:458:3a5a:94a5 with SMTP id d75a77b69052e-461145a9d0dmr82563921cf.2.1729774432163; Thu, 24 Oct 2024 05:53:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+UtvMow94tWOBWPVT+/JG0M5ak3+e0JQmIrjr05BmysIvIgE9ZeC7OPkSx19NStuVQpIDYw== X-Received: by 2002:a05:622a:3ce:b0:458:3a5a:94a5 with SMTP id d75a77b69052e-461145a9d0dmr82563581cf.2.1729774431507; Thu, 24 Oct 2024 05:53:51 -0700 (PDT) Received: from [192.168.0.174] ([104.219.121.80]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-460d3c3b304sm51299721cf.6.2024.10.24.05.53.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Oct 2024 05:53:50 -0700 (PDT) Message-ID: <9ae81606-7e34-423c-b9d5-98147a43d5b6@redhat.com> Date: Thu, 24 Oct 2024 08:53:49 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: gcc-patches Cc: aldy@quesejoda.com From: Andrew MacLeod Subject: [COMMITTED 4/4] - Implement pointer_or_operator. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.5 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Well, perhaps the subject isn't precise  The existing pointer_or_operator is, like a few others, using irange operands, so is non-functional and this patch removes it. The functionality was never moved to the new dispatch system when Prange was implemented, and IIRC it was because Aldy never found a case that triggered.  Regardless, this adds the functionality that once existed via operator_bitwise_or::fold_range() with Prange operands. Bootstraps on x86_64-pc-linux-gnu with no regressions.  pushed. Andrew From 57f720af635e47d8b5515eddaef9df02769f353b Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Wed, 23 Oct 2024 10:59:13 -0400 Subject: [PATCH 4/4] Implement pointer_or_operator. The class pointer_or is no longer used, and can be removed. Its functionality was never moved to the new dispatch system. This implements operator_bitwise_or::fold_range() for prange operands. * range-op-mixed.h (operator_bitwise_or::fold_range): Add prange variant. * range-op-ptr.cc (class pointer_or_operator): Remove. (pointer_or_operator::op1_range): Remove. (pointer_or_operator::op2_range): Remove. (pointer_or_operator::wi_fold): Remove. (operator_bitwise_or::fold_range): New prange variant. --- gcc/range-op-mixed.h | 6 +++++ gcc/range-op-ptr.cc | 63 +++++++------------------------------------- 2 files changed, 16 insertions(+), 53 deletions(-) diff --git a/gcc/range-op-mixed.h b/gcc/range-op-mixed.h index cc1db2f6775..f7c447d935e 100644 --- a/gcc/range-op-mixed.h +++ b/gcc/range-op-mixed.h @@ -809,9 +809,15 @@ protected: class operator_bitwise_or : public range_operator { public: + using range_operator::fold_range; using range_operator::op1_range; using range_operator::op2_range; using range_operator::update_bitmask; + + bool fold_range (prange &r, tree type, + const prange &op1, + const prange &op2, + relation_trio) const final override; bool op1_range (irange &r, tree type, const irange &lhs, const irange &op2, relation_trio rel = TRIO_VARYING) const override; diff --git a/gcc/range-op-ptr.cc b/gcc/range-op-ptr.cc index dd312a80366..ef2b2cce516 100644 --- a/gcc/range-op-ptr.cc +++ b/gcc/range-op-ptr.cc @@ -379,69 +379,26 @@ pointer_plus_operator::op2_range (irange &r, tree type, return true; } - -class pointer_or_operator : public range_operator -{ -public: - using range_operator::op1_range; - using range_operator::op2_range; - 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; -} op_pointer_or; - -bool -pointer_or_operator::op1_range (irange &r, tree type, - const irange &lhs, - const irange &op2 ATTRIBUTE_UNUSED, - relation_trio) const -{ - if (lhs.undefined_p ()) - return false; - if (lhs.zero_p ()) - { - r.set_zero (type); - return true; - } - r.set_varying (type); - return true; -} - bool -pointer_or_operator::op2_range (irange &r, tree type, - const irange &lhs, - const irange &op1, - relation_trio) const -{ - return pointer_or_operator::op1_range (r, type, lhs, op1); -} - -void -pointer_or_operator::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 +operator_bitwise_or::fold_range (prange &r, tree type, + const prange &op1, + const prange &op2, + relation_trio) const { // For pointer types, we are really only interested in asserting // whether the expression evaluates to non-NULL. - if (!wi_includes_zero_p (type, lh_lb, lh_ub) - && !wi_includes_zero_p (type, rh_lb, rh_ub)) + if (!op1.zero_p () || !op2.zero_p ()) r.set_nonzero (type); - else if (wi_zero_p (type, lh_lb, lh_ub) && wi_zero_p (type, rh_lb, rh_ub)) + else if (op1.zero_p () && op2.zero_p ()) r.set_zero (type); else r.set_varying (type); + + update_known_bitmask (r, BIT_IOR_EXPR, op1, op2); + return true; } + class operator_pointer_diff : public range_operator { using range_operator::fold_range; -- 2.45.0