From patchwork Mon Mar 4 22:11:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1907916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NgPlW2zX; dkim-atps=neutral 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=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpXwY75Xlz23cm for ; Tue, 5 Mar 2024 09:11:40 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A5BA9385841E for ; Mon, 4 Mar 2024 22:11:38 +0000 (GMT) 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 A55C33858D28 for ; Mon, 4 Mar 2024 22:11:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A55C33858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A55C33858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709590284; cv=none; b=qSW2Rf2ERlSExtox09g+FmeGMrkUjRucNpAw6xQ/VOPxa/lRMbqVPPcb6OIEt3bBSg802bl4IKvEbwVr8cXC67AYWaeBQvbvfYki758ISYIWc17dPOHATOhZP9hDwf0pxiWwMhcUnyq35/6OXxEiLdRHSDGpdnI7B1Coahrw9gA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709590284; c=relaxed/simple; bh=5BEZSMI3J38IFsdvMqunQJp57LrHSSkkVgVWdPhAOvA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RlQrDkdgZiPJiqohSaJJXJXAOZK1nWTfJYeOsfk14civQ7euK0qQ/ICe4Y3cRJ0o9FEqgXBCWL5Tz/77xjk1PDUhGoOSUQc9BaA2F2J8MiSCPS5DtOVggFO4QBF+JshFz1elBgCVFGo0vks8vHC3Qcbn/oxHTWU3CDFBupk/9Ms= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709590281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nNPI+HQhKK4RHUYmqJyiR3oBwyyWHApZWuRpp2Wel/w=; b=NgPlW2zXz5dC5GX+CPbd4zwKhZcFLk/+RgubMZmrRhp7a9jas73e9j9K2r9aJLvPIjPuRV HxXaFlCU9kTIX92JZEchsrmn1DtFrIbybWW2ihw7OeNqKFHODnW0lIAi858AmU2n38b5mD swy7hpzvWD9xMk6Ub3GvchVlfcYZdK0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-ssR6HhkxMNKILEhQaQngSw-1; Mon, 04 Mar 2024 17:11:19 -0500 X-MC-Unique: ssR6HhkxMNKILEhQaQngSw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D224185A783 for ; Mon, 4 Mar 2024 22:11:19 +0000 (UTC) Received: from pdp-11.lan (unknown [10.22.9.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E3EE492CAC; Mon, 4 Mar 2024 22:11:19 +0000 (UTC) From: Marek Polacek To: GCC Patches , Jason Merrill Subject: [PATCH] c++: ICE with variable template and [[deprecated]] [PR110031] Date: Mon, 4 Mar 2024 17:11:14 -0500 Message-ID: <20240304221114.475713-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk/13? -- >8 -- lookup_and_finish_template_variable already has and uses the complain parameter but it is not passing it down to mark_used so we got the default tf_warning_or_error, which causes various problems when lookup_and_finish_template_variable gets called with complain=tf_none. PR c++/110031 gcc/cp/ChangeLog: * pt.cc (lookup_and_finish_template_variable): Pass complain to mark_used. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/inline-var11.C: New test. --- gcc/cp/pt.cc | 2 +- gcc/testsuite/g++.dg/cpp1z/inline-var11.C | 32 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/inline-var11.C base-commit: a89c5df317d1de74871e2a05c36aed9cbbb21f42 diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index c4bc54a8fdb..48d2b3cbac6 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -10533,7 +10533,7 @@ lookup_and_finish_template_variable (tree templ, tree targs, if (var == error_mark_node) return error_mark_node; var = finish_template_variable (var, complain); - mark_used (var); + mark_used (var, complain); return var; } diff --git a/gcc/testsuite/g++.dg/cpp1z/inline-var11.C b/gcc/testsuite/g++.dg/cpp1z/inline-var11.C new file mode 100644 index 00000000000..d92911ed3a9 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/inline-var11.C @@ -0,0 +1,32 @@ +// PR c++/110031 +// { dg-do compile { target c++17 } } + +template +[[deprecated]] +inline constexpr bool t = true ; + +template +struct enableif; + +template<> +struct enableif +{ + using y = int; +}; +template +using enableif_t = typename enableif::y; + +template > = 0> // { dg-warning "deprecated" } +struct A { A(T &&) { }}; + +template +struct A { + A(T &&) = delete; + A() = delete; +}; + +int main(void) +{ + A a(5.3); // { dg-error "use of deleted function" } + return 0; +}