From patchwork Wed Feb 22 11:04:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 60460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp508284wrd; Wed, 22 Feb 2023 03:05:13 -0800 (PST) X-Google-Smtp-Source: AK7set+ePpxa1/z2m7qv0wncqKLcrMsqj1aYICYy8h3dTJ5aJ3zFRxji1Pu8PX5bp1+j7nt+mIEa X-Received: by 2002:aa7:d4d4:0:b0:4ad:316:b4e6 with SMTP id t20-20020aa7d4d4000000b004ad0316b4e6mr7258080edr.42.1677063913606; Wed, 22 Feb 2023 03:05:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677063913; cv=none; d=google.com; s=arc-20160816; b=J4fG8HhHqTrljkCRifJNrV/pbs7OkyFHF4OkI73MsMjXroCPxi2oTTz+mPNTG4kPsZ X2E/Mup9Yz9iIp+zUjEzXnzyAQ4RqkVQo4EkzqeQs9dT8KeZNczHVgE4RzB3I4SbRUbu 8neu3Yn1bMOJnfrqrPUwFg67ZOjFJcXQab0OL5kPCpGg0J112MlnD9WzJJ8j2Z1jJtnK jKGwMb3wdYMgbgIBxi5e+aGahkDmFGhrKtfU3k6AkXCZJctfh8S/uRXIVfDJRvJOwF35 hN8ZatRRsjuXWooz/JXmm0HBh7gwvAiqD+5LTqR6la1eZJw7D/N9OYowhorExEwV2FK/ +D2Q== 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-disposition:in-reply-to:mime-version:references:message-id :subject:cc:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=sQBopJ27HDjafwkk6FRVRmj2wZGQO4LEcMNudpfp5N4=; b=etPiEj8dh24YncZwVxfwyaJgl07/t2VwDN3ov4ruYTJYGYS5iqNRfSO4ZbdasIRPzA ExyIODW0sciJcVBErSJptsp7dPnx1XLOtCLVzOT0bT5zaLcgGoOOvxbUQq7u0LSMzZ2n ThRD3aw4rIwV7fPFzHxViInALatjZLCsgpMm3UHWQmkTWuhasiFSkqiok8PaYlet9G5V j1bGjTIxgdXmSQWJhHMUgcSs6h9x2QO34FIExPdyi6LFGRjIO6xw9HMrc+4smQepMZKf xYAUO9m2Cgi5Ru+x+YD9F+DX9r5cpLDP5P89slS+iLhODWifJKk9pUOgF5bjpswVwiXS jTLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=fiNKTAE2; 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 w26-20020aa7cb5a000000b004accda9fff4si4389769edt.299.2023.02.22.03.05.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 03:05:13 -0800 (PST) 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=fiNKTAE2; 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 6ACF93858C54 for ; Wed, 22 Feb 2023 11:05:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6ACF93858C54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677063912; bh=sQBopJ27HDjafwkk6FRVRmj2wZGQO4LEcMNudpfp5N4=; h=Date:To:Cc:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=fiNKTAE2lxw+LWKEArA4Kycq7YvAfH/qUjcmJLckzBTGREfopNusv5gOcvUzNzj1M EOGZh2sxOmvTCaW2XcrKZHm3RXyqagSYk7+A4uZq5z8CxOk7EIcYux92YTGDb0B+Ts zglqkcPJFjlxWVLAtWi21x+3Y74Asqde0FOlbclU= 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 9BD433858D33 for ; Wed, 22 Feb 2023 11:04:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9BD433858D33 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-155-XtXxa9R-PwC_fmHj_3JR0Q-1; Wed, 22 Feb 2023 06:04:22 -0500 X-MC-Unique: XtXxa9R-PwC_fmHj_3JR0Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 35BBD3801F54; Wed, 22 Feb 2023 11:04:22 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E96A118EC1; Wed, 22 Feb 2023 11:04:21 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 31MB4Jto4185587 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 22 Feb 2023 12:04:19 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 31MB4Ime4185586; Wed, 22 Feb 2023 12:04:18 +0100 Date: Wed, 22 Feb 2023 12:04:18 +0100 To: Richard Biener Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] tree: Add 3 argument fndecl_built_in_p Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek 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?1758528970432777793?= X-GMAIL-MSGID: =?utf-8?q?1758528970432777793?= On Wed, Feb 22, 2023 at 09:52:06AM +0000, Richard Biener wrote: > > The following testcase ICEs because we still have some spots that > > treat BUILT_IN_UNREACHABLE specially but not BUILT_IN_UNREACHABLE_TRAP > > the same. This patch uses (fndecl_built_in_p (node, BUILT_IN_UNREACHABLE) || fndecl_built_in_p (node, BUILT_IN_UNREACHABLE_TRAP)) a lot and from grepping around, we do something like that in lots of other places, or in some spots instead as (fndecl_built_in_p (node, BUILT_IN_NORMAL) && (DECL_FUNCTION_CODE (node) == BUILT_IN_WHATEVER1 || DECL_FUNCTION_CODE (node) == BUILT_IN_WHATEVER2)) The following patch adds an overload for this case, so we can write it in a shorter way. It isn't worth for 3+, code in that case typically uses the fndecl_built_in_p (node, BUILT_IN_NORMAL) + switch in DECL_FUNCTION_CODE. If this isn't appropriate for GCC 13 (or not at all), I think we'll need to change at least ipa-prop.cc because it suffers from the same problem as the previous patch was fixing. 2023-02-22 Jakub Jelinek * tree.h (fndecl_built_in_p): New overload with 2 built_in_function arguments. * builtins.cc (fold_builtin_expect): Use it. * gimplify.cc (goa_stabilize_expr): Likewise. * cgraphclones.cc (cgraph_node::create_clone): Likewise. * ipa-fnsummary.cc (compute_fn_summary): Likewise. * omp-low.cc (setjmp_or_longjmp_p): Likewise. * cgraph.cc (cgraph_edge::redirect_call_stmt_to_callee, cgraph_update_edges_for_call_stmt_node, cgraph_edge::verify_corresponds_to_fndecl, cgraph_node::verify_node): Likewise. * tree-stdarg.cc (optimize_va_list_gpr_fpr_size): Likewise. * gimple-ssa-warn-access.cc (matching_alloc_calls_p): Likewise. * ipa-prop.cc (try_make_edge_direct_virtual_call): Handle BUILT_IN_UNREACHABLE_TRAP like BUILT_IN_UNREACHABLE. Jakub --- gcc/tree.h.jj 2023-02-17 12:45:08.223636043 +0100 +++ gcc/tree.h 2023-02-22 11:25:31.608825229 +0100 @@ -6615,6 +6615,18 @@ fndecl_built_in_p (const_tree node, buil && DECL_FUNCTION_CODE (node) == name); } +/* Faster variant of + fndecl_built_in_p (NODE, NAME1) || fndecl_built_in_p (NODE, NAME2). */ + +inline bool +fndecl_built_in_p (const_tree node, built_in_function name1, + built_in_function name2) +{ + return (fndecl_built_in_p (node, BUILT_IN_NORMAL) + && (DECL_FUNCTION_CODE (node) == name1 + || DECL_FUNCTION_CODE (node) == name2)); +} + /* A struct for encapsulating location information about an operator and the operation built from it. --- gcc/builtins.cc.jj 2023-02-14 12:09:57.163647987 +0100 +++ gcc/builtins.cc 2023-02-22 11:29:43.800179949 +0100 @@ -8625,8 +8625,8 @@ fold_builtin_expect (location_t loc, tre if (TREE_CODE (inner) == CALL_EXPR && (fndecl = get_callee_fndecl (inner)) - && (fndecl_built_in_p (fndecl, BUILT_IN_EXPECT) - || fndecl_built_in_p (fndecl, BUILT_IN_EXPECT_WITH_PROBABILITY))) + && fndecl_built_in_p (fndecl, BUILT_IN_EXPECT, + BUILT_IN_EXPECT_WITH_PROBABILITY)) return arg0; inner = inner_arg0; --- gcc/gimplify.cc.jj 2023-02-15 09:23:27.807390189 +0100 +++ gcc/gimplify.cc 2023-02-22 11:32:38.446655528 +0100 @@ -15815,8 +15815,8 @@ goa_stabilize_expr (tree *expr_p, gimple if (TREE_CODE (expr) == CALL_EXPR) { if (tree fndecl = get_callee_fndecl (expr)) - if (fndecl_built_in_p (fndecl, BUILT_IN_CLEAR_PADDING) - || fndecl_built_in_p (fndecl, BUILT_IN_MEMCMP)) + if (fndecl_built_in_p (fndecl, BUILT_IN_CLEAR_PADDING, + BUILT_IN_MEMCMP)) { int nargs = call_expr_nargs (expr); for (int i = 0; i < nargs; i++) --- gcc/cgraphclones.cc.jj 2023-02-22 11:21:56.467934980 +0100 +++ gcc/cgraphclones.cc 2023-02-22 11:28:30.272242754 +0100 @@ -425,9 +425,8 @@ cgraph_node::create_clone (tree new_decl version. The only exception is when the edge was proved to be unreachable during the cloning procedure. */ if (!e->callee - || !(fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) - || fndecl_built_in_p (e->callee->decl, - BUILT_IN_UNREACHABLE_TRAP))) + || !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, + BUILT_IN_UNREACHABLE_TRAP)) e->redirect_callee_duplicating_thunks (new_node); } new_node->expand_all_artificial_thunks (); --- gcc/ipa-fnsummary.cc.jj 2023-01-02 09:32:45.510951148 +0100 +++ gcc/ipa-fnsummary.cc 2023-02-22 11:33:07.922229473 +0100 @@ -3180,8 +3180,8 @@ compute_fn_summary (struct cgraph_node * for (e = node->callees; e; e = e->next_callee) { tree cdecl = e->callee->decl; - if (fndecl_built_in_p (cdecl, BUILT_IN_APPLY_ARGS) - || fndecl_built_in_p (cdecl, BUILT_IN_VA_START)) + if (fndecl_built_in_p (cdecl, BUILT_IN_APPLY_ARGS, + BUILT_IN_VA_START)) break; } node->can_change_signature = !e; --- gcc/omp-low.cc.jj 2023-01-02 09:32:25.281243440 +0100 +++ gcc/omp-low.cc 2023-02-22 11:35:06.418516664 +0100 @@ -3992,8 +3992,7 @@ scan_omp_1_op (tree *tp, int *walk_subtr static bool setjmp_or_longjmp_p (const_tree fndecl) { - if (fndecl_built_in_p (fndecl, BUILT_IN_SETJMP) - || fndecl_built_in_p (fndecl, BUILT_IN_LONGJMP)) + if (fndecl_built_in_p (fndecl, BUILT_IN_SETJMP, BUILT_IN_LONGJMP)) return true; tree declname = DECL_NAME (fndecl); --- gcc/cgraph.cc.jj 2023-02-22 11:21:56.466934995 +0100 +++ gcc/cgraph.cc 2023-02-22 11:27:29.907115300 +0100 @@ -1548,8 +1548,8 @@ cgraph_edge::redirect_call_stmt_to_calle else { if (flag_checking - && !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) - && !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE_TRAP)) + && !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, + BUILT_IN_UNREACHABLE_TRAP)) ipa_verify_edge_has_no_modifications (e); new_stmt = e->call_stmt; gimple_call_set_fndecl (new_stmt, e->callee->decl); @@ -1635,9 +1635,8 @@ cgraph_update_edges_for_call_stmt_node ( { /* Keep calls marked as dead dead. */ if (new_stmt && is_gimple_call (new_stmt) && e->callee - && (fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) - || fndecl_built_in_p (e->callee->decl, - BUILT_IN_UNREACHABLE_TRAP))) + && fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, + BUILT_IN_UNREACHABLE_TRAP)) { cgraph_edge::set_call_stmt (node->get_edge (old_stmt), as_a (new_stmt)); @@ -3259,9 +3258,8 @@ cgraph_edge::verify_corresponds_to_fndec /* Optimizers can redirect unreachable calls or calls triggering undefined behavior to __builtin_unreachable or __builtin_unreachable trap. */ - if (fndecl_built_in_p (callee->decl, BUILT_IN_NORMAL) - && (DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_UNREACHABLE - || DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_UNREACHABLE_TRAP)) + if (fndecl_built_in_p (callee->decl, BUILT_IN_UNREACHABLE, + BUILT_IN_UNREACHABLE_TRAP)) return false; if (callee->former_clone_of != node->decl @@ -3601,9 +3599,8 @@ cgraph_node::verify_node (void) /* Optimized out calls are redirected to __builtin_unreachable. */ && (e->count.nonzero_p () || ! e->callee->decl - || !(fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) - || fndecl_built_in_p (e->callee->decl, - BUILT_IN_UNREACHABLE_TRAP))) + || !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, + BUILT_IN_UNREACHABLE_TRAP)) && count == ENTRY_BLOCK_PTR_FOR_FN (DECL_STRUCT_FUNCTION (decl))->count && (!e->count.ipa_p () --- gcc/tree-stdarg.cc.jj 2023-01-02 09:32:24.970247934 +0100 +++ gcc/tree-stdarg.cc 2023-02-22 11:38:22.383684097 +0100 @@ -867,8 +867,8 @@ optimize_va_list_gpr_fpr_size (function tree callee = gimple_call_fndecl (stmt); if (callee - && (fndecl_built_in_p (callee, BUILT_IN_VA_START) - || fndecl_built_in_p (callee, BUILT_IN_VA_END))) + && fndecl_built_in_p (callee, BUILT_IN_VA_START, + BUILT_IN_VA_END)) continue; } --- gcc/gimple-ssa-warn-access.cc.jj 2023-02-16 10:13:23.822208868 +0100 +++ gcc/gimple-ssa-warn-access.cc 2023-02-22 11:31:36.168555726 +0100 @@ -1780,8 +1780,7 @@ matching_alloc_calls_p (tree alloc_decl, /* Return false for deallocation functions that are known not to match. */ - if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE) - || fndecl_built_in_p (dealloc_decl, BUILT_IN_REALLOC)) + if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE, BUILT_IN_REALLOC)) return false; /* Otherwise proceed below to check the deallocation function's "*dealloc" attributes to look for one that mentions this operator @@ -1805,8 +1804,8 @@ matching_alloc_calls_p (tree alloc_decl, if (DECL_IS_OPERATOR_DELETE_P (dealloc_decl)) return false; - if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE) - || fndecl_built_in_p (dealloc_decl, BUILT_IN_REALLOC)) + if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE, + BUILT_IN_REALLOC)) return true; alloc_dealloc_kind = alloc_kind_t::builtin; --- gcc/ipa-prop.cc.jj 2023-01-02 09:32:46.077942956 +0100 +++ gcc/ipa-prop.cc 2023-02-22 11:34:15.572251634 +0100 @@ -3849,7 +3849,8 @@ try_make_edge_direct_virtual_call (struc if (can_refer) { if (!t - || fndecl_built_in_p (t, BUILT_IN_UNREACHABLE) + || fndecl_built_in_p (t, BUILT_IN_UNREACHABLE, + BUILT_IN_UNREACHABLE_TRAP) || !possible_polymorphic_call_target_p (ie, cgraph_node::get (t))) {