From patchwork Thu Sep 22 19:00:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 1387 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp342774wrt; Thu, 22 Sep 2022 12:02:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5XBt/fLfeGVbe5joXbXfwVRWcsuF9u9h1sgq05AQVwhs/5ald6/Dh6fU277L98+S2URxmU X-Received: by 2002:a17:906:fd8d:b0:780:997:8b7b with SMTP id xa13-20020a170906fd8d00b0078009978b7bmr4158384ejb.635.1663873352132; Thu, 22 Sep 2022 12:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663873352; cv=none; d=google.com; s=arc-20160816; b=YounK3E3LCfnLl/Tc95XiLyZltMj/KprZaFjxVGBJitISQNIXnz+VYzWMubuZy5oT+ dvFSXN1R56R27nELbwTP9QYNBn7EwrgLVS4sOGVXPRA4f0+ngNS/rXF09f9bjV/UnpcO imIrZO7i7XZARm08NA/nYE1UxLNVCj5ebiujfXUIcQwl8YaP4ptAKT+2GfPxhQ98MD6A DNwlSIMH2xZkqOSEp5YTEj6CN2K/faDNjFB6EN+rvVlw1YiBchQavptINstWf13+/CP+ zgLul3zME3AscGp4uftUw4v/ieRdlMEMOckOoCtOYHdn7WqfxoKI1aGWZ+AYOw9lbZMv y5+w== 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-language :in-reply-to:references:to:subject:user-agent:mime-version:date :message-id:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=q9jcDor9udpn1yLfD6osPFEGPymjGpENs6e98L6SQVs=; b=vny6SoLcZxnhqlWQllADnne/JNj6+xVix8jzrma+d0WonC9d4+Zzwo6SCXWTGGjRbK oVRLCYlbbr6uBgF4EkguQYEb45PmWnIm7+dqAk0Cmhq2Kcuy0DLLMfbAeozbJYrC07/1 +yXOdIUVgv7LR+djN7RQ9YiFdMr+Om0DmEDLYqs9O1utMqO2qwR9XhKoUPm9EaM1iArf yaOOO9oMbXL/VrRLDPQn3yKImLtB/OTzkn7l22Ax8q0mRX9B5PQmiA+jMsOPyhtUF7Qk IC6re5WFZ6G9YN1yNZRTqI8hysaf0YPENnZtF1AS0MzqxeBiWgOv0NwwpeosOE2/aQwk kiPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Ed9+vDFM; 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 hp31-20020a1709073e1f00b0078037cd5c3csi4102924ejc.279.2022.09.22.12.02.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 12:02:32 -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=Ed9+vDFM; 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 02007385782D for ; Thu, 22 Sep 2022 19:02:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02007385782D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663873346; bh=q9jcDor9udpn1yLfD6osPFEGPymjGpENs6e98L6SQVs=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Ed9+vDFMOMCeXOUYWE8NSkR/xF59RD8DqKRjXoG70/0MfsOqpvFEa/cik2looQ8ly 3lpjFQ3TjpqzpCda+5qIMbxmWrRMz41Sb0LAWV5C5/+pyXMXHAUjFnnKFaUoqEmkNm 91239gfb8Q35y0S2fpsbHSunN9ubge9UTDvGJ4WI= 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 4CBBF3858400 for ; Thu, 22 Sep 2022 19:00:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4CBBF3858400 Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-114-a3M6QIedP6GatNpJI3MnBQ-1; Thu, 22 Sep 2022 15:00:31 -0400 X-MC-Unique: a3M6QIedP6GatNpJI3MnBQ-1 Received: by mail-il1-f200.google.com with SMTP id k3-20020a056e02156300b002f5623faa62so6247685ilu.0 for ; Thu, 22 Sep 2022 12:00:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date; bh=lDKFnSHxu1YlwOOfaG35eg/oUUBm3ZcoQ+S4wNGrQcU=; b=Y/ja2bA9Xf+1IWh1hMwDqpFjss+S1PUjQ+cczHJWappi+sEI1fTuKuOoVjUhGEMjCY gJn1rScyan0k/f8jFBIOsfNgo90dJyBxS8C2fqDO6A/K1Ob86FLwn+As3cdTsJALTUf7 pQsmTk0/DMjmN2wgrBUuzMvZD0EHsd0+dekfP7m19xUCLsV9ZVDBbWkulzYIVXMyrFE4 rSBgm4b0yZiJYl3qwqLrjVVKbslKWn3cDCMIVVyFYnwS0vojW4ulNBcWpc5MeFA1JWt9 qaJCpVNAbcnjWSTsPEPOnTCKQ3Yd/RIW6QvmXMWA95cZAiLUoXmeESZKoxrynfKPo4Y4 uVXQ== X-Gm-Message-State: ACrzQf2RwBNv48M2MdNFzbaFeWQ/0916dUtSSRs3ovfbWLeWrUW6Kfn+ 0jgkwsCXlrTn5shgcpCWLZeSzAEXvrW5zvrnm45qcV5BM43K/lfBc/saMG1tH2zt3tRekNyKPBQ 4xzBICXCL3J/6+iWtjZ6XgTc7vTXF3UNyA1dRswBbsjEYtDmUYQQdJVgodIX9synCfR7Dvw== X-Received: by 2002:a92:c266:0:b0:2f5:f5eb:3510 with SMTP id h6-20020a92c266000000b002f5f5eb3510mr2413049ild.24.1663873229801; Thu, 22 Sep 2022 12:00:29 -0700 (PDT) X-Received: by 2002:a92:c266:0:b0:2f5:f5eb:3510 with SMTP id h6-20020a92c266000000b002f5f5eb3510mr2413037ild.24.1663873229591; Thu, 22 Sep 2022 12:00:29 -0700 (PDT) Received: from ?IPV6:2607:fea8:a263:f600::3dbe? ([2607:fea8:a263:f600::3dbe]) by smtp.gmail.com with ESMTPSA id n17-20020a027151000000b0034c14a6ea76sm2463362jaf.51.2022.09.22.12.00.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Sep 2022 12:00:28 -0700 (PDT) Message-ID: <35eb7b99-9e99-dded-2dbc-1bc400df0a48@redhat.com> Date: Thu, 22 Sep 2022 15:00:27 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 Subject: [PATCH 06/17] Always check the return value of fold_range. To: gcc-patches References: <571782f9-72e6-5c30-da55-b8d62d3a153e@redhat.com> In-Reply-To: <571782f9-72e6-5c30-da55-b8d62d3a153e@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.6 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.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: Andrew MacLeod via Gcc-patches From: Andrew MacLeod Reply-To: Andrew MacLeod 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?1744697663863985578?= X-GMAIL-MSGID: =?utf-8?q?1744697663863985578?= The fold_range routine in range-ops returns FALSE if the operation fails.  There are a few places which assume the operation was successful.  Fix those. Bootstrapped on x86_64-pc-linux-gnu with no regressions.  Pushed. Andrew From 2f92f685da2ef9e82ee6262519919180df8f2dd9 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Wed, 21 Sep 2022 16:15:02 -0400 Subject: [PATCH 06/17] Always check the return value of fold_range. The fold_range routine in range-ops returns FALSE if the operation fails. There are a few places which assume the operation was successful. Fix those. * gimple-range-fold.cc (range_of_range_op): Set result to VARYING if the call to fold_range fails. * tree-data-ref.cc (compute_distributive_range): Ditto. * tree-vrp.cc (range_fold_binary_expr): Ditto. (range_fold_unary_expr): Ditto. * value-query.cc (range_query::get_tree_range): Ditto. --- gcc/gimple-range-fold.cc | 6 ++++-- gcc/tree-data-ref.cc | 6 ++++-- gcc/tree-vrp.cc | 6 ++++-- gcc/value-query.cc | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index addf3e7f254..42408254c35 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -544,7 +544,8 @@ fold_using_range::range_of_range_op (vrange &r, // Fold range, and register any dependency if available. Value_Range r2 (type); r2.set_varying (type); - handler.fold_range (r, type, range1, r2); + if (!handler.fold_range (r, type, range1, r2)) + r.set_varying (type); if (lhs && gimple_range_ssa_p (op1)) { if (src.gori ()) @@ -567,7 +568,8 @@ fold_using_range::range_of_range_op (vrange &r, fputc ('\n', dump_file); } // Fold range, and register any dependency if available. - handler.fold_range (r, type, range1, range2, rel); + if (!handler.fold_range (r, type, range1, range2, rel)) + r.set_varying (type); if (irange::supports_p (type)) relation_fold_and_or (as_a (r), s, src); if (lhs) diff --git a/gcc/tree-data-ref.cc b/gcc/tree-data-ref.cc index ff9327f6deb..91bfb619d66 100644 --- a/gcc/tree-data-ref.cc +++ b/gcc/tree-data-ref.cc @@ -594,7 +594,8 @@ compute_distributive_range (tree type, value_range &op0_range, if (result_range) { range_op_handler op (code, type); - op.fold_range (*result_range, type, op0_range, op1_range); + if (!op.fold_range (*result_range, type, op0_range, op1_range)) + result_range->set_varying (type); } /* The distributive property guarantees that if TYPE is no narrower @@ -642,7 +643,8 @@ compute_distributive_range (tree type, value_range &op0_range, range_op_handler op (code, ssizetype); bool saved_flag_wrapv = flag_wrapv; flag_wrapv = 1; - op.fold_range (wide_range, ssizetype, op0_range, op1_range); + if (!op.fold_range (wide_range, ssizetype, op0_range, op1_range)) + wide_range.set_varying (ssizetype);; flag_wrapv = saved_flag_wrapv; if (wide_range.num_pairs () != 1 || !range_int_cst_p (&wide_range)) return false; diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc index c3030a1b130..93482e5d102 100644 --- a/gcc/tree-vrp.cc +++ b/gcc/tree-vrp.cc @@ -1069,7 +1069,8 @@ range_fold_binary_expr (value_range *vr, vr1.set_varying (expr_type); vr0.normalize_addresses (); vr1.normalize_addresses (); - op.fold_range (*vr, expr_type, vr0, vr1); + if (!op.fold_range (*vr, expr_type, vr0, vr1)) + vr->set_varying (expr_type); } /* Perform a unary operation on a range. */ @@ -1095,7 +1096,8 @@ range_fold_unary_expr (value_range *vr, value_range vr0_cst (*vr0); vr0_cst.normalize_addresses (); - op.fold_range (*vr, expr_type, vr0_cst, value_range (expr_type)); + if (!op.fold_range (*vr, expr_type, vr0_cst, value_range (expr_type))) + vr->set_varying (expr_type); } /* If the range of values taken by OP can be inferred after STMT executes, diff --git a/gcc/value-query.cc b/gcc/value-query.cc index 0bdd670982b..296784be31d 100644 --- a/gcc/value-query.cc +++ b/gcc/value-query.cc @@ -252,7 +252,8 @@ range_query::get_tree_range (vrange &r, tree expr, gimple *stmt) Value_Range r1 (TREE_TYPE (TREE_OPERAND (expr, 1))); range_of_expr (r0, TREE_OPERAND (expr, 0), stmt); range_of_expr (r1, TREE_OPERAND (expr, 1), stmt); - op.fold_range (r, type, r0, r1); + if (!op.fold_range (r, type, r0, r1)) + r.set_varying (type); } else r.set_varying (type); @@ -268,7 +269,8 @@ range_query::get_tree_range (vrange &r, tree expr, gimple *stmt) Value_Range r1 (type); r1.set_varying (type); range_of_expr (r0, TREE_OPERAND (expr, 0), stmt); - op.fold_range (r, type, r0, r1); + if (!op.fold_range (r, type, r0, r1)) + r.set_varying (type); } else r.set_varying (type); -- 2.37.3