From patchwork Thu Mar 23 21:18:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1760571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=QN4QVwZS; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PjJ9R0V4Kz1yXr for ; Fri, 24 Mar 2023 08:18:33 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DE83F385417F for ; Thu, 23 Mar 2023 21:18:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE83F385417F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679606310; bh=ZGuSIkApzyAIwPHPg4yY5HXCeLuwFirNk/+E6qjH2VQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=QN4QVwZS7Wx45+cuhRmOyHquF3RNj6NwrB+6y+M1DSV3EdBS9+WJK5P6IZVJd6YVs zKxD1Mwh3jYpxMAg10DexbGM5f8+GQQEygYoS1WUnAxlXUC1z6aPLQEXiRdJrY5sU7 orXfy1g9dc3NHIWOTVfGN4MjUFzlbN9rKMBzTdiw= 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 90CF53858C50 for ; Thu, 23 Mar 2023 21:18:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90CF53858C50 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-K1ikW2jXM1OtuYhaiZD75w-1; Thu, 23 Mar 2023 17:18:10 -0400 X-MC-Unique: K1ikW2jXM1OtuYhaiZD75w-1 Received: by mail-qk1-f197.google.com with SMTP id z187-20020a3765c4000000b007468706dfb7so6587392qkb.9 for ; Thu, 23 Mar 2023 14:18:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679606289; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZGuSIkApzyAIwPHPg4yY5HXCeLuwFirNk/+E6qjH2VQ=; b=XY6HgHbdqhKNU2iMfsqxg6P53mt5dy2KMsFzUNDxGx9bhA+bmiuVGKg6C7li0uaG6z tLP7C9rKbBIeczcLq5+4D4SyYl4bQ2ZWpSu/QYr/SkQypXP9H8JYnSJbLdi0KV3DHv+H Up3vmUlYX7H9Sz4QSZ1gkh6T8geZvNhlbH1RvCijNk8IYhi26qfS19vTSPgIfFg04zvo O9cXm6tSwlmdu8TjLkr5JKEC9d68yUzIuJySTzU5f8h9satmjYx+ToePf9CnL6khVDwA VF+IG4IEbVsKlt7JCmfdQJFGDY3ofTbnj1Aap9bwQ9YzM2SyszKlwpkZxheDtn/petR8 MSTw== X-Gm-Message-State: AAQBX9epjWBUw6bFLpJlCoWREo3629UBgCo9xlO18FYwZLEz0EOloa6V lv/l+2/Dh5vz6k2tbhNqFGoqpN2ip4Biv9E9qsTL3vj7TAhWXpjszkK1CXd7mqxtk000KlCIZJz qEorGe/d+hXHrmvug1NS0W5MpZT9/y2jsw8txfIf04GXQEH1VETcYhosKy+C7wTWwqUFwi8Tv/H A= X-Received: by 2002:a05:6214:1243:b0:56e:b1c8:381b with SMTP id r3-20020a056214124300b0056eb1c8381bmr474988qvv.31.1679606288715; Thu, 23 Mar 2023 14:18:08 -0700 (PDT) X-Google-Smtp-Source: AKy350ZmeYjDuMeJayfAjkduo2Ipi2y0vgT1gY246bmzT3GjIKE9DHVsLK8mNvWk2WrzhMMb2f9RuA== X-Received: by 2002:a05:6214:1243:b0:56e:b1c8:381b with SMTP id r3-20020a056214124300b0056eb1c8381bmr474939qvv.31.1679606288209; Thu, 23 Mar 2023 14:18:08 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id w10-20020a0cff0a000000b005dd8b934585sm159174qvt.29.2023.03.23.14.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 14:18:07 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH 1/2] c++: improve "NTTP argument considered unused" fix [PR53164, PR105848] Date: Thu, 23 Mar 2023 17:18:02 -0400 Message-Id: <20230323211803.396326-1-ppalka@redhat.com> X-Mailer: git-send-email 2.40.0.130.g27d43aaaf5 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.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 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" r13-995-g733a792a2b2e16 worked around the problem of FUNCTION_DECL template arguments not always getting marked as odr-used by redundantly calling mark_used on the substituted ADDR_EXPR callee of a CALL_EXPR. This is just a narrow workaround however, since using a FUNCTION_DECL as a template argument alone should constitutes an odr-use; we shouldn't need to subsequently e.g. call the function or take its address. This patch fixes this in a more general way at template specialization time by walking the template arguments of the specialization and calling mark_used on all entities used within. As before, the call to mark_used as it worst a no-op, but it compensates for the situation where we end up forming a specialization from a template context in which mark_used is inhibited. Another approach would be to call mark_used whenever we substitute a TEMPLATE_PARM_INDEX, but that would result in many more redundant calls to mark_used compared to this approach. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? PR c++/53164 PR c++/105848 gcc/cp/ChangeLog: * pt.cc (instantiate_class_template): Call mark_template_arguments_used. (tsubst_copy_and_build) : Revert r13-995 change. (mark_template_arguments_used): Define. (instantiate_template): Call mark_template_arguments_used. gcc/testsuite/ChangeLog: * g++.dg/template/fn-ptr3a.C: New test. * g++.dg/template/fn-ptr4.C: New test. --- gcc/cp/pt.cc | 51 ++++++++++++++++-------- gcc/testsuite/g++.dg/template/fn-ptr3a.C | 25 ++++++++++++ gcc/testsuite/g++.dg/template/fn-ptr4.C | 14 +++++++ 3 files changed, 74 insertions(+), 16 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/fn-ptr3a.C create mode 100644 gcc/testsuite/g++.dg/template/fn-ptr4.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 7e4a8de0c8b..9b3cc33331c 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -220,6 +220,7 @@ static tree make_argument_pack (tree); static tree enclosing_instantiation_of (tree tctx); static void instantiate_body (tree pattern, tree args, tree d, bool nested); static tree maybe_dependent_member_ref (tree, tree, tsubst_flags_t, tree); +static void mark_template_arguments_used (tree); /* Make the current scope suitable for access checking when we are processing T. T can be FUNCTION_DECL for instantiated function @@ -12142,6 +12143,9 @@ instantiate_class_template (tree type) cp_unevaluated_operand = 0; c_inhibit_evaluation_warnings = 0; } + + mark_template_arguments_used (INNERMOST_TEMPLATE_ARGS (args)); + /* Use #pragma pack from the template context. */ saved_maximum_field_alignment = maximum_field_alignment; maximum_field_alignment = TYPE_PRECISION (pattern); @@ -21173,22 +21177,10 @@ tsubst_copy_and_build (tree t, } /* Remember that there was a reference to this entity. */ - if (function != NULL_TREE) - { - tree inner = function; - if (TREE_CODE (inner) == ADDR_EXPR - && TREE_CODE (TREE_OPERAND (inner, 0)) == FUNCTION_DECL) - /* We should already have called mark_used when taking the - address of this function, but do so again anyway to make - sure it's odr-used: at worst this is a no-op, but if we - obtained this FUNCTION_DECL as part of ahead-of-time overload - resolution then that call to mark_used wouldn't have marked it - odr-used yet (53164). */ - inner = TREE_OPERAND (inner, 0); - if (DECL_P (inner) - && !mark_used (inner, complain) && !(complain & tf_error)) - RETURN (error_mark_node); - } + if (function != NULL_TREE + && DECL_P (function) + && !mark_used (function, complain) && !(complain & tf_error)) + RETURN (error_mark_node); if (!maybe_fold_fn_template_args (function, complain)) return error_mark_node; @@ -21883,6 +21875,31 @@ check_instantiated_args (tree tmpl, tree args, tsubst_flags_t complain) return result; } +/* Call mark_used on each entity within the template arguments ARGS of some + template specialization, to ensure that each such entity is considered + odr-used regardless of whether the specialization was first formed in a + template context. + + This function assumes push_to_top_level has been called beforehand, and + that processing_template_decl has been set iff the template arguments + are dependent. */ + +static void +mark_template_arguments_used (tree args) +{ + gcc_checking_assert (TMPL_ARGS_DEPTH (args) == 1); + + if (processing_template_decl) + return; + + auto mark_used_r = [](tree *tp, int *, void *) { + if (DECL_P (*tp)) + mark_used (*tp, tf_none); + return NULL_TREE; + }; + cp_walk_tree_without_duplicates (&args, mark_used_r, nullptr); +} + /* We're out of SFINAE context now, so generate diagnostics for the access errors we saw earlier when instantiating D from TMPL and ARGS. */ @@ -22012,6 +22029,8 @@ instantiate_template (tree tmpl, tree orig_args, tsubst_flags_t complain) push_nested_class (ctx); } + mark_template_arguments_used (INNERMOST_TEMPLATE_ARGS (targ_ptr)); + tree pattern = DECL_TEMPLATE_RESULT (gen_tmpl); fndecl = NULL_TREE; diff --git a/gcc/testsuite/g++.dg/template/fn-ptr3a.C b/gcc/testsuite/g++.dg/template/fn-ptr3a.C new file mode 100644 index 00000000000..7456be5d51f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/fn-ptr3a.C @@ -0,0 +1,25 @@ +// PR c++/53164 +// PR c++/105848 +// A stricter version of fn-ptr3.C that verifies using f as a template +// argument alone constitutes an odr-use. + +template +void f(T) { T::fail; } // { dg-error "fail" } + +template +struct A { + static void wrap(); +}; + +template +void wrap(); + +template +void g() { + A::wrap(); // { dg-message "required from here" } + wrap(); // { dg-message "required from here" } +} + +int main() { + g<0>(); +} diff --git a/gcc/testsuite/g++.dg/template/fn-ptr4.C b/gcc/testsuite/g++.dg/template/fn-ptr4.C new file mode 100644 index 00000000000..e7425ba96cc --- /dev/null +++ b/gcc/testsuite/g++.dg/template/fn-ptr4.C @@ -0,0 +1,14 @@ +// { dg-do compile } + +template +void wrap() { + P(); // OK, despite A::g not being accessible from foo. +} + +struct A { + static void f() { + wrap(); + } +private: + static void g(); +};