From patchwork Tue May 23 12:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 97985 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2119489vqo; Tue, 23 May 2023 05:59:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6lGYwXqTLjAf2bLcRoGP7ajtucLyWIks2XrOiBSBarWLT8DUx3vDKuyuTgHEw+DbcDRtaS X-Received: by 2002:a17:907:6287:b0:968:4d51:800b with SMTP id nd7-20020a170907628700b009684d51800bmr12649513ejc.1.1684846779474; Tue, 23 May 2023 05:59:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684846779; cv=none; d=google.com; s=arc-20160816; b=nN/Fd1to5x0lm1UGcqOcDguE6bDddgEk7BQ0k9T8rL1YxT9AI4EXXIyB7rQxFa5E40 h3ZDIaJfOxgpr2B+mv3EIVhRn4TGLhWFd5np88NOMWxpcctcMAqf27O7OEueE3v9DHx/ sMT9tLGrCrUjZmwhxPmdLdorM/1OHf/ytAlNFIF2R8useBlKh0MdH2fo9QL0OXCCRyZN nwwiYaoHkERE1tEKAomSt1BUZegqbI44Yyw3EpAtX8dBL/ok6GcvZTioHZB0GsIriDgm +0YeX5o36128fSFvCPcdK++6XhWKzF+CIcfI4N5FG37fCRm2s50pZf1dWE/ZKR1uLoa7 k3gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=5+XABwa3fyEuZGMIgvk0PCzWLN7yI4tfxSIctA8tEQE=; b=npuJ47nkCNREZwyUCQKQhsqaZcT2JRwL4TaiAmyi7ZuNOfkPs8KeMldN5vn9mItXUs neb7KTMU4BePlc2J4IiSAsE86mmxDILQsYSBxSSqdxVImwKla+0TBL5JfZmDECFucAOT +c1uIdUwrJCbNxW7sJsTv1PidRb5vaTNbTfCD80HTfzhpX7zLIpCmEmYRkbARvecPKOM 9DmYpWhzgMSHN+U2gq4tp5N3jjp699Sn59ySQa6lUNoMXn3C6xRxwldakUQItsUZSd+S Q6O+NTSnRabemvfDvOWQNHag+EsegYEU8B5L1+eBw117zw30rJ5q/LvUaQKI+VQyl3oQ BqRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=HDUG4P2t; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id b23-20020aa7cd17000000b0050bf551fe46si694913edw.30.2023.05.23.05.59.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 05:59:39 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=HDUG4P2t; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 302B1385840C for ; Tue, 23 May 2023 12:59:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 302B1385840C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684846774; bh=5+XABwa3fyEuZGMIgvk0PCzWLN7yI4tfxSIctA8tEQE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=HDUG4P2to6l7CctuqyY1poI/ftAUes7v9VcghoX1AcccyZVRXkDR6PnR7iuU/48dU w8M8xpsNp12tA23KskL5Uw0kekeS2G1Bq3P5DjyWk2vSHx/SMaWzmNr8ArqJi86irv /DV7nbxHt1YuiVWJrP6I5yBMXiQTe4AIyXLLIRY4= 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 ESMTPS id 7EF7D3858D37 for ; Tue, 23 May 2023 12:58:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7EF7D3858D37 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-472-RpZbIyG1NZCsM_4s5bi5Hg-1; Tue, 23 May 2023 08:58:42 -0400 X-MC-Unique: RpZbIyG1NZCsM_4s5bi5Hg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 76A523C025C7 for ; Tue, 23 May 2023 12:58:42 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F1E640C6CCF; Tue, 23 May 2023 12:58:41 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.17.1/8.17.1) with ESMTPS id 34NCwdIf642408 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 23 May 2023 14:58:39 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 34NCwdMN642407; Tue, 23 May 2023 14:58:39 +0200 To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Remove buggy special case in irange::invert [PR109934]. Date: Tue, 23 May 2023 14:58:36 +0200 Message-Id: <20230523125836.642394-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 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_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766689896700673502?= X-GMAIL-MSGID: =?utf-8?q?1766689896700673502?= [Andrew, do you remotely remember what if anything this did? It came from a wholesale merge from our long forgotten branch, so there's no history on the specifics of it. Not important, I'm just curious. It was probably me high on something.] This patch removes a buggy special case in irange::invert which seems to have been broken for a while, and probably never triggered because the legacy code was handled elsewhere, and the non-legacy code was using an int_range_max of int_range<255> which made it extremely likely for num_ranges == 255. However, with auto-resizing ranges, int_range_max will start off at 3 and can hit this bogus code in the unswitching code. PR tree-optimization/109934 gcc/ChangeLog: * value-range.cc (irange::invert): Remove buggy special case. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/pr109934.c: New test. --- gcc/testsuite/gcc.dg/tree-ssa/pr109934.c | 22 ++++++++++++++++++++++ gcc/value-range.cc | 8 -------- 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr109934.c diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr109934.c b/gcc/testsuite/gcc.dg/tree-ssa/pr109934.c new file mode 100644 index 00000000000..08bd5ce95c6 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr109934.c @@ -0,0 +1,22 @@ +// { dg-do run } +// { dg-options "-O3" } + +int printf(const char *, ...); +short a; +long b = 3, c; +int d(int e) { + switch (e) + case 111: + case 222: + case 44: + return 0; + return e; +} +int main() { + for (; a >= 0; --a) + if (d(c + 23) - 23) + b = 0; + + if (b != 3) + __builtin_abort (); +} diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 45b1e655967..874a1843ebf 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -1650,14 +1650,6 @@ irange::invert () wide_int type_min = wi::min_value (prec, sign); wide_int type_max = wi::max_value (prec, sign); m_nonzero_mask = wi::minus_one (prec); - if (m_num_ranges == m_max_ranges - && lower_bound () != type_min - && upper_bound () != type_max) - { - m_base[1] = type_max; - m_num_ranges = 1; - return; - } // At this point, we need one extra sub-range to represent the // inverse.