From patchwork Thu Sep 22 19:06:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 57935 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 E35BB385782C for ; Thu, 22 Sep 2022 19:07:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E35BB385782C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663873648; bh=PBph2QULcN+GdX+bqDcQc7NmFESQMYmy7BYW20b/w+s=; 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=JfTdVQynENPbrFXRXG+pRDEeWgN3WsWq7RQEYP+x6A7fHxIn4+S7pJj+6GyJgqK37 P3MYnFMdLz2PvYcT+Gg5sYx4jshUlqdTBHWxe/WDtSu4kIA8kjqsXdku3YiMwWr9ew hU9IoyBylgvJphwRxTM7AgzRScvXSGfJZuzhFzPY= 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 807A83857341 for ; Thu, 22 Sep 2022 19:06:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 807A83857341 Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-245-1-0jcMdrMHOuNvLGrPejJg-1; Thu, 22 Sep 2022 15:06:53 -0400 X-MC-Unique: 1-0jcMdrMHOuNvLGrPejJg-1 Received: by mail-io1-f71.google.com with SMTP id y10-20020a5d914a000000b00688fa7b2252so5287495ioq.0 for ; Thu, 22 Sep 2022 12:06:53 -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=3hcilMJ4u7BBEdZca+ypX8wuy27HKOk5JBWTJ9eFVhI=; b=inu45vNWdWrWoiPmKk1f8RSBku+jTDU9E7rR85tCsHFyOuLC/V6XUDiKYpMVar/t44 rIK5j15x2O5Trz4xpRbeT3EE+hCLDJNjvj6I5dJDzUWcsbaGs3p5GBiOJOkyWsoq56yG S7gB9hy9WThgVZXGVa7WPywW1c0jTgZP+5EhHy66XRdX5xVhNRGQHiPmjkA/ea3OQgCp pJCyIhRG9v46Aau85EaQGV93Jw4i8JBfDu+5DPTxxKPGEBcw0o2A61KLwr65/o/TgtpW /OQcMDeUau0azYBvKcYq9pybprVAbvHUTbyci/lhyUJGpN/3xVCSgfeyZ2R1l1KazZ7i dF1A== X-Gm-Message-State: ACrzQf3P+s7WEOE3zYJuCXGdbY31OLpw7VXa6TkqGNs3t9oSxUuh6dOd D0DYRH1wmrXtuMnbEZmM9Qep4ZbhCnwBJGgPEi1d+oSHKIZ9Tl2tEt3fLRsykvtzth43+U2nCUj 1b0+1O7zA9n8h4w95RLpOABlEJdUTBc1NWQK/cqrm1fhb3bbdCFKqqq3IB2qZgi5uHZTQCg== X-Received: by 2002:a92:730c:0:b0:2f5:7dd7:45f7 with SMTP id o12-20020a92730c000000b002f57dd745f7mr2500207ilc.12.1663873612558; Thu, 22 Sep 2022 12:06:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7e5FRo3LWEXRhSfXGOVTEfMROKci64lgRXWuJrjoEyBH/bufnFZZjb5b3oAdGlyUUks20zWg== X-Received: by 2002:a92:730c:0:b0:2f5:7dd7:45f7 with SMTP id o12-20020a92730c000000b002f57dd745f7mr2500197ilc.12.1663873612309; Thu, 22 Sep 2022 12:06:52 -0700 (PDT) Received: from ?IPV6:2607:fea8:a263:f600::3dbe? ([2607:fea8:a263:f600::3dbe]) by smtp.gmail.com with ESMTPSA id m12-20020a92d70c000000b002f6028e31cesm2314685iln.61.2022.09.22.12.06.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Sep 2022 12:06:51 -0700 (PDT) Message-ID: Date: Thu, 22 Sep 2022 15:06:50 -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 14/17] Convert CFN_BUILT_IN_UBSAN_CHECK_* to range-ops. 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.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_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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Bootstrapped on x86_64-pc-linux-gnu with no regressions.  Pushed. Andrew From b6f670ff706e35dc51a62db4206cb241dcac4963 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Tue, 20 Sep 2022 18:48:05 -0400 Subject: [PATCH 14/17] Convert CFN_BUILT_IN_UBSAN_CHECK_* to range-ops. * gimple-range-fold.cc (range_of_builtin_ubsan_call): Delete. (range_of_builtin_int_call): Remove cases for CFN_BUILT_IN_UBSAN_CHECK. * gimple-range-op.cc (class cfn_ubsan): New. (gimple_range_op_handler::maybe_builtin_call): Set arguments. --- gcc/gimple-range-fold.cc | 47 +-------------------------------- gcc/gimple-range-op.cc | 56 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 46 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index 1d7d1da7bbe..d445270417a 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -852,41 +852,6 @@ fold_using_range::range_of_call (vrange &r, gcall *call, fur_source &src) return true; } -// Return the range of a __builtin_ubsan* in CALL and set it in R. -// CODE is the type of ubsan call (PLUS_EXPR, MINUS_EXPR or -// MULT_EXPR). - -void -fold_using_range::range_of_builtin_ubsan_call (irange &r, gcall *call, - tree_code code, fur_source &src) -{ - gcc_checking_assert (code == PLUS_EXPR || code == MINUS_EXPR - || code == MULT_EXPR); - tree type = gimple_range_type (call); - range_op_handler op (code, type); - gcc_checking_assert (op); - int_range_max ir0, ir1; - tree arg0 = gimple_call_arg (call, 0); - tree arg1 = gimple_call_arg (call, 1); - src.get_operand (ir0, arg0); - src.get_operand (ir1, arg1); - // Check for any relation between arg0 and arg1. - relation_kind relation = src.query_relation (arg0, arg1); - - bool saved_flag_wrapv = flag_wrapv; - // Pretend the arithmetic is wrapping. If there is any overflow, - // we'll complain, but will actually do wrapping operation. - flag_wrapv = 1; - op.fold_range (r, type, ir0, ir1, relation); - flag_wrapv = saved_flag_wrapv; - - // If for both arguments vrp_valueize returned non-NULL, this should - // have been already folded and if not, it wasn't folded because of - // overflow. Avoid removing the UBSAN_CHECK_* calls in that case. - if (r.singleton_p ()) - r.set_varying (type); -} - // For a builtin in CALL, return a range in R if known and return // TRUE. Otherwise return FALSE. @@ -909,7 +874,7 @@ fold_using_range::range_of_builtin_call (vrange &r, gcall *call, bool fold_using_range::range_of_builtin_int_call (irange &r, gcall *call, - fur_source &src) + fur_source &) { combined_fn func = gimple_call_combined_fn (call); if (func == CFN_LAST) @@ -924,16 +889,6 @@ fold_using_range::range_of_builtin_int_call (irange &r, gcall *call, r.set (build_zero_cst (type), build_one_cst (type)); return true; - case CFN_UBSAN_CHECK_ADD: - range_of_builtin_ubsan_call (r, call, PLUS_EXPR, src); - return true; - case CFN_UBSAN_CHECK_SUB: - range_of_builtin_ubsan_call (r, call, MINUS_EXPR, src); - return true; - case CFN_UBSAN_CHECK_MUL: - range_of_builtin_ubsan_call (r, call, MULT_EXPR, src); - return true; - case CFN_GOACC_DIM_SIZE: case CFN_GOACC_DIM_POS: // Optimizing these two internal functions helps the loop diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index bee225431e8..09b7dd2add3 100644 --- a/gcc/gimple-range-op.cc +++ b/gcc/gimple-range-op.cc @@ -576,6 +576,41 @@ public: } } op_cfn_clrsb; + +// Implement range operator for CFN_BUILT_IN_ +class cfn_ubsan : public range_operator +{ +public: + cfn_ubsan (enum tree_code code) { m_code = code; } + using range_operator::fold_range; + virtual bool fold_range (irange &r, tree type, const irange &lh, + const irange &rh, relation_kind rel) const + { + range_op_handler handler (m_code, type); + gcc_checking_assert (handler); + + bool saved_flag_wrapv = flag_wrapv; + // Pretend the arithmetic is wrapping. If there is any overflow, + // we'll complain, but will actually do wrapping operation. + flag_wrapv = 1; + bool result = handler.fold_range (r, type, lh, rh, rel); + flag_wrapv = saved_flag_wrapv; + + // If for both arguments vrp_valueize returned non-NULL, this should + // have been already folded and if not, it wasn't folded because of + // overflow. Avoid removing the UBSAN_CHECK_* calls in that case. + if (result && r.singleton_p ()) + r.set_varying (type); + return result; + } +private: + enum tree_code m_code; +}; + +cfn_ubsan op_cfn_ubsan_add (PLUS_EXPR); +cfn_ubsan op_cfn_ubsan_sub (MINUS_EXPR); +cfn_ubsan op_cfn_ubsan_mul (MULT_EXPR); + // Set up a gimple_range_op_handler for any built in function which can be // supported via range-ops. @@ -655,6 +690,27 @@ gimple_range_op_handler::maybe_builtin_call () m_int = &op_cfn_clrsb; break; + case CFN_UBSAN_CHECK_ADD: + m_op1 = gimple_call_arg (call, 0); + m_op2 = gimple_call_arg (call, 1); + m_valid = true; + m_int = &op_cfn_ubsan_add; + break; + + case CFN_UBSAN_CHECK_SUB: + m_op1 = gimple_call_arg (call, 0); + m_op2 = gimple_call_arg (call, 1); + m_valid = true; + m_int = &op_cfn_ubsan_sub; + break; + + case CFN_UBSAN_CHECK_MUL: + m_op1 = gimple_call_arg (call, 0); + m_op2 = gimple_call_arg (call, 1); + m_valid = true; + m_int = &op_cfn_ubsan_mul; + break; + default: break; } -- 2.37.3