From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id D9C453858D33 for ; Wed, 22 Feb 2023 18:46:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D9C453858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x52f.google.com with SMTP id b12so34356407edd.4 for ; Wed, 22 Feb 2023 10:46:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=qMibRuvOlm6lifx6pCNCxjjOS2kn6rp9y12wEc3Ffnk=; b=mLkc0Fa9TTF1tKlFmdvnWqYqU/7sDQU9deL42TTRQe2dO5+6iUmjNqgT+Bgj2PwPbB niYwmx1BdhtIze7bkJvCDVNrImZT8hHxbhHqzDbgJMKK3+t9ZJpyk4TNd9VjOX/pcZAv qrXfPzCNhj6llKppmHYuYUvCt7tfvXhPrzEQ9Fyc8jSllBBO7DaxRLncH5oheVrLWXuI iDKRJDBKYhYLCIp3klN1eT4T94Whxg5ZwtCTLSYHc54rEgWd7wGleR0cMHvu/ZK8rxXh RwyLzEzDZKr8eZfmCYSUHnFRnPZ72y4TNRl8xb6F+ekGEAmeyB5sJGksysuI+cAzr63Y O+wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qMibRuvOlm6lifx6pCNCxjjOS2kn6rp9y12wEc3Ffnk=; b=Toq46b7Sw8z+QockP5N8gFIWwQRgST3X25NsCVzVi2Opo+AXMim6VrIn6bzabuYhkN ag1VbXoOmt2rAJ16GW0DEc0VG01J55VYbUbZHy1/aznsx2OaDaDeoB6g79XQlmPzVVgh mCmG9YYztLNv1lWefeUJ58N3E4Zev3tiFqt7JlofgWup5d5fZZcVjHaG38yhkAgs7uQz kmvcVA6AyCpNawTi4S0OQDYu0wCSv1JYvDEajipb31FaFWujl76V65XOG0cWW0cEg91g 3/6/jpL441BwJwa3ccxFTpqPrC82F2zfX7xQt6jpwKk0LFtHd8gWSca6XKwwznJ7H+9p x6lg== X-Gm-Message-State: AO0yUKVuSHg788Mm9jxoEYHblkW8viwep6Y0CgM/jc1RDmoBCpKcnD2I IEiNQ3Drr/DhhluAXkpQ9EzeL6UMr3w= X-Google-Smtp-Source: AK7set8fG6bCLv47odu4SVwK5geqvg+NpMaLXyXXVvnlJBUG4gpogS5u3L66cUDTbdhdAETuZnilWw== X-Received: by 2002:a17:907:1c0f:b0:8d7:6699:3bae with SMTP id nc15-20020a1709071c0f00b008d766993baemr11056424ejc.57.1677091618330; Wed, 22 Feb 2023 10:46:58 -0800 (PST) Received: from smtpclient.apple (dynamic-077-007-061-103.77.7.pool.telefonica.de. [77.7.61.103]) by smtp.gmail.com with ESMTPSA id me19-20020a170906aed300b008b17662e1f7sm8167530ejb.53.2023.02.22.10.46.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Feb 2023 10:46:57 -0800 (PST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Richard Biener Mime-Version: 1.0 (1.0) Subject: Re: [PATCH] tree, v2: Add 3 argument fndecl_built_in_p Date: Wed, 22 Feb 2023 19:46:46 +0100 Message-Id: References: Cc: Richard Biener , Jonathan Wakely , gcc-patches@gcc.gnu.org In-Reply-To: To: Jakub Jelinek X-Mailer: iPhone Mail (20D67) X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: > Am 22.02.2023 um 19:34 schrieb Jakub Jelinek : >=20 > =EF=BB=BFOn Wed, Feb 22, 2023 at 12:35:24PM +0000, Jonathan Wakely wrote: >> Yes, I was right, it doesn't work in gcc 4.8. This does though (with >> typos above fixed too, and actually tested on GCC 4.8.5): >=20 > I think we don't need the DECL_FUNCTION_CODE (node) in every recursive cal= l, > we can just pass DECL_FUNCTION_CODE (node) down instead. >=20 > The following patch does that, tested again also with gcc 4.8: Ok for stage1 Thanks, Richard=20 > 2023-02-22 Jakub Jelinek > Jonathan Wakely >=20 > * tree.h (built_in_function_equal_p): New helper function. > (fndecl_built_in_p): Turn into variadic template to support > 1 or more built_in_function arguments. > * builtins.cc (fold_builtin_expect): Use 3 argument fndecl_built_in_p. > * 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. >=20 > --- gcc/tree.h.jj 2023-02-17 12:45:08.223636043 +0100 > +++ gcc/tree.h 2023-02-22 17:10:57.410410020 +0100 > @@ -6575,6 +6575,24 @@ type_has_mode_precision_p (const_tree t) > return known_eq (TYPE_PRECISION (t), GET_MODE_PRECISION (TYPE_MODE (t)))= ; > } >=20 > +/* Helper functions for fndecl_built_in_p. */ > + > +inline bool > +built_in_function_equal_p (built_in_function name0, built_in_function nam= e1) > +{ > + return name0 =3D=3D name1; > +} > + > +/* Recursive case for two or more names. */ > + > +template > +inline bool > +built_in_function_equal_p (built_in_function name0, built_in_function nam= e1, > + built_in_function name2, F... names) > +{ > + return name0 =3D=3D name1 || built_in_function_equal_p (name0, name2, na= mes...); > +} > + > /* Return true if a FUNCTION_DECL NODE is a GCC built-in function. >=20 > Note that it is different from the DECL_IS_UNDECLARED_BUILTIN > @@ -6606,13 +6624,16 @@ fndecl_built_in_p (const_tree node, unsi > } >=20 > /* Return true if a FUNCTION_DECL NODE is a GCC built-in function > - of BUILT_IN_NORMAL class with name equal to NAME. */ > + of BUILT_IN_NORMAL class with name equal to NAME1 (or other mentioned > + NAMES). */ >=20 > +template > inline bool > -fndecl_built_in_p (const_tree node, built_in_function name) > +fndecl_built_in_p (const_tree node, built_in_function name1, F... names) > { > return (fndecl_built_in_p (node, BUILT_IN_NORMAL) > - && DECL_FUNCTION_CODE (node) =3D=3D name); > + && built_in_function_equal_p (DECL_FUNCTION_CODE (node), > + name1, names...)); > } >=20 > /* A struct for encapsulating location information about an operator > --- 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 >=20 > if (TREE_CODE (inner) =3D=3D CALL_EXPR > && (fndecl =3D 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; >=20 > inner =3D 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) =3D=3D CALL_EXPR) > { > if (tree fndecl =3D 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 =3D call_expr_nargs (expr); > for (int i =3D 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 =3D node->callees; e; e =3D e->next_callee) > { > tree cdecl =3D 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 =3D !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; >=20 > tree declname =3D 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 =3D 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 undefin= ed > behavior to __builtin_unreachable or __builtin_unreachable trap. */ >=20 > - if (fndecl_built_in_p (callee->decl, BUILT_IN_NORMAL) > - && (DECL_FUNCTION_CODE (callee->decl) =3D=3D BUILT_IN_UNREACHABLE > - || DECL_FUNCTION_CODE (callee->decl) =3D=3D BUILT_IN_UNREACHABLE_TR= AP)) > + if (fndecl_built_in_p (callee->decl, BUILT_IN_UNREACHABLE, > + BUILT_IN_UNREACHABLE_TRAP)) > return false; >=20 > if (callee->former_clone_of !=3D 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 > =3D=3D ENTRY_BLOCK_PTR_FOR_FN (DECL_STRUCT_FUNCTION (decl))->coun= t > && (!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 =3D gimple_call_fndecl (stmt); >=20 > 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; > } >=20 > --- gcc/gimple-ssa-warn-access.cc.jj 2023-02-16 10:13:23.822208868 +010= 0 > +++ 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, >=20 > /* 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_REALLO= C)) > 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; >=20 > - 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; >=20 > alloc_dealloc_kind =3D 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))) > { >=20 >=20 > Jakub >=20