From patchwork Fri Feb 25 21:59:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1597960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=u5Uzk1Ja; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K53cR1S8Mz9sGG for ; Sat, 26 Feb 2022 09:00:39 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E73E43858432 for ; Fri, 25 Feb 2022 22:00:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E73E43858432 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1645826436; bh=0aER3OEpQRMdlKAHfIo7HFZD36DQNKGbhWy1aWJ9ot8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=u5Uzk1Jam8Mvy6YtYV6WlFvmGpeDsTBsZE8D1m/haJX7TAnEeEFSGP2z397r7DU9R TZ562ZUIaXDee5oQ+0FYNRhogQQbwlH9E+xUr7Zr9J7+8uzREK9iFrSddBtGD6EzjM pDxv5Vldbj0t8LuisAZ5HLliwsEvyR+PURqoTBLU= 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 1FA193858000 for ; Fri, 25 Feb 2022 21:59:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1FA193858000 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-141-ko8jvtEFPEmcdxBBNZHdrA-1; Fri, 25 Feb 2022 16:59:24 -0500 X-MC-Unique: ko8jvtEFPEmcdxBBNZHdrA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE61E1006AA5 for ; Fri, 25 Feb 2022 21:59:23 +0000 (UTC) Received: from pdp-11.hsd1.ma.comcast.net (unknown [10.22.34.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 991CD863AB; Fri, 25 Feb 2022 21:59:23 +0000 (UTC) To: GCC Patches , Jason Merrill Subject: [PATCH] c++: Lost deprecated/unavailable attr in class tmpl [PR104682] Date: Fri, 25 Feb 2022 16:59:21 -0500 Message-Id: <20220225215921.324060-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.6 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, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Marek Polacek via Gcc-patches From: Marek Polacek Reply-To: Marek Polacek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" [ Most likely a GCC 13 patch, but I'm posting it now so that I don't lose it. ] When looking into the other PR I noticed that we fail to give a warning for a deprecated enumerator when the enum is in a class template. This only happens when the attribute doesn't have an argument. The reason is that when we tsubst_enum, we create a new enumerator: build_enumerator (DECL_NAME (decl), value, newtag, DECL_ATTRIBUTES (decl), DECL_SOURCE_LOCATION (decl)); but DECL_ATTRIBUTES (decl) is null when the attribute was provided without an argument -- in that case it simply melts into a tree flag. handle_deprecated_attribute has: if (!args) *no_add_attrs = true; so the attribute isn't retained and we lose it when tsubsting. Same thing when the attribute is on the enum itself. Attribute unavailable is a similar case, but it's different in that it can be a late attribute whereas "deprecated" can't: is_late_template_attribute has /* But some attributes specifically apply to templates. */ && !is_attribute_p ("abi_tag", name) && !is_attribute_p ("deprecated", name) && !is_attribute_p ("visibility", name)) return true; else return false; which looks strange, but attr-unavailable-9.C tests that we don't error when the attribute is applied on a template. Bootstrapped/regtested on x86_64-pc-linux-gnu. PR c++/104682 gcc/cp/ChangeLog: * cp-tree.h (build_enumerator): Adjust. * decl.cc (finish_enum): Make it return the new decl. * pt.cc (tsubst_enum): Propagate TREE_DEPRECATED and TREE_UNAVAILABLE. gcc/testsuite/ChangeLog: * g++.dg/ext/attr-unavailable-10.C: New test. * g++.dg/ext/attr-unavailable-11.C: New test. * g++.dg/warn/deprecated-17.C: New test. * g++.dg/warn/deprecated-18.C: New test. --- gcc/cp/cp-tree.h | 2 +- gcc/cp/decl.cc | 4 +- gcc/cp/pt.cc | 17 +++++++-- .../g++.dg/ext/attr-unavailable-10.C | 22 +++++++++++ .../g++.dg/ext/attr-unavailable-11.C | 22 +++++++++++ gcc/testsuite/g++.dg/warn/deprecated-17.C | 35 ++++++++++++++++++ gcc/testsuite/g++.dg/warn/deprecated-18.C | 37 +++++++++++++++++++ 7 files changed, 133 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/ext/attr-unavailable-10.C create mode 100644 gcc/testsuite/g++.dg/ext/attr-unavailable-11.C create mode 100644 gcc/testsuite/g++.dg/warn/deprecated-17.C create mode 100644 gcc/testsuite/g++.dg/warn/deprecated-18.C base-commit: f62115c9b770a66c5378f78a2d5866243d560573 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 37d462fca6e..80994e94793 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -6833,7 +6833,7 @@ extern void xref_basetypes (tree, tree); extern tree start_enum (tree, tree, tree, tree, bool, bool *); extern void finish_enum_value_list (tree); extern void finish_enum (tree); -extern void build_enumerator (tree, tree, tree, tree, location_t); +extern tree build_enumerator (tree, tree, tree, tree, location_t); extern tree lookup_enumerator (tree, tree); extern bool start_preparsed_function (tree, tree, int); extern bool start_function (cp_decl_specifier_seq *, diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 7b48b56231b..7f80f9d4d7a 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -16409,7 +16409,7 @@ finish_enum (tree enumtype) Apply ATTRIBUTES if available. LOC is the location of NAME. Assignment of sequential values by default is handled here. */ -void +tree build_enumerator (tree name, tree value, tree enumtype, tree attributes, location_t loc) { @@ -16611,6 +16611,8 @@ incremented enumerator value is too large for %")); /* Add this enumeration constant to the list for this type. */ TYPE_VALUES (enumtype) = tree_cons (name, decl, TYPE_VALUES (enumtype)); + + return decl; } /* Look for an enumerator with the given NAME within the enumeration diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 70f02db8757..8fb17349ee1 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -26944,9 +26944,8 @@ tsubst_enum (tree tag, tree newtag, tree args) for (e = TYPE_VALUES (tag); e; e = TREE_CHAIN (e)) { tree value; - tree decl; + tree decl = TREE_VALUE (e); - decl = TREE_VALUE (e); /* Note that in a template enum, the TREE_VALUE is the CONST_DECL, not the corresponding INTEGER_CST. */ value = tsubst_expr (DECL_INITIAL (decl), @@ -26958,8 +26957,14 @@ tsubst_enum (tree tag, tree newtag, tree args) /* Actually build the enumerator itself. Here we're assuming that enumerators can't have dependent attributes. */ - build_enumerator (DECL_NAME (decl), value, newtag, - DECL_ATTRIBUTES (decl), DECL_SOURCE_LOCATION (decl)); + tree newdecl = build_enumerator (DECL_NAME (decl), value, newtag, + DECL_ATTRIBUTES (decl), + DECL_SOURCE_LOCATION (decl)); + /* Attribute deprecated without an argument isn't sticky: it'll + melt into a tree flag, so we need to propagate the flag here, + since we just created a new enumerator. */ + TREE_DEPRECATED (newdecl) = TREE_DEPRECATED (decl); + TREE_UNAVAILABLE (newdecl) = TREE_UNAVAILABLE (decl); } if (SCOPED_ENUM_P (newtag)) @@ -26970,6 +26975,10 @@ tsubst_enum (tree tag, tree newtag, tree args) DECL_SOURCE_LOCATION (TYPE_NAME (newtag)) = DECL_SOURCE_LOCATION (TYPE_NAME (tag)); + TREE_DEPRECATED (newtag) = TREE_DEPRECATED (tag); + /* We don't need to propagate TREE_UNAVAILABLE here, because it is, unlike + deprecated, applied at instantiation time rather than template + definition time. */ } /* DECL is a FUNCTION_DECL that is a template specialization. Return diff --git a/gcc/testsuite/g++.dg/ext/attr-unavailable-10.C b/gcc/testsuite/g++.dg/ext/attr-unavailable-10.C new file mode 100644 index 00000000000..cfb99476b9f --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/attr-unavailable-10.C @@ -0,0 +1,22 @@ +// PR c++/104682 +// { dg-do compile { target c++11 } } + +template +struct S { + enum E1 { + A __attribute__((unavailable)) + }; +}; + +struct S2 { + enum E2 { + A __attribute__((unavailable)) + }; +}; + +void +g () +{ + auto a1 = S::E1::A; // { dg-error "is unavailable" } + auto b1 = S2::E2::A; // { dg-error "is unavailable" } +} diff --git a/gcc/testsuite/g++.dg/ext/attr-unavailable-11.C b/gcc/testsuite/g++.dg/ext/attr-unavailable-11.C new file mode 100644 index 00000000000..fce24528908 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/attr-unavailable-11.C @@ -0,0 +1,22 @@ +// PR c++/104682 +// { dg-do compile { target c++11 } } + +template +struct S { + enum B { + A + } __attribute__((unavailable)) ; +}; + +struct S2 { + enum B { + A + } __attribute__((unavailable)); +}; + +void +g () +{ + S::B a1; // { dg-error "is unavailable" } + S2::B a2; // { dg-error "is unavailable" } +} diff --git a/gcc/testsuite/g++.dg/warn/deprecated-17.C b/gcc/testsuite/g++.dg/warn/deprecated-17.C new file mode 100644 index 00000000000..c4e768538fa --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/deprecated-17.C @@ -0,0 +1,35 @@ +// PR c++/104682 +// { dg-do compile { target c++11 } } + +template +struct S { + enum E1 { + A __attribute__((deprecated)), + B __attribute__((deprecated("B"))), + C [[deprecated]], + D [[deprecated("D")]] + }; +}; + +struct S2 { + enum E2 { + A __attribute__((deprecated)), + B __attribute__((deprecated("B"))), + C [[deprecated]], + D [[deprecated("D")]] + }; +}; + +void +g () +{ + auto a1 = S::E1::A; // { dg-warning "is deprecated" } + auto a2 = S::E1::B; // { dg-warning "is deprecated" } + auto a3 = S::E1::C; // { dg-warning "is deprecated" } + auto a4 = S::E1::D; // { dg-warning "is deprecated" } + + auto b1 = S2::A; // { dg-warning "is deprecated" } + auto b2 = S2::B; // { dg-warning "is deprecated" } + auto b3 = S2::C; // { dg-warning "is deprecated" } + auto b4 = S2::D; // { dg-warning "is deprecated" } +} diff --git a/gcc/testsuite/g++.dg/warn/deprecated-18.C b/gcc/testsuite/g++.dg/warn/deprecated-18.C new file mode 100644 index 00000000000..0d101a9cc90 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/deprecated-18.C @@ -0,0 +1,37 @@ +// PR c++/104682 +// { dg-do compile { target c++11 } } + +template +struct S { + enum B { + A + } __attribute__((deprecated)) ; +}; + +struct S2 { + enum B { + A + } __attribute__((deprecated)); +}; + +template +struct S3 { + enum [[deprecated]] B { + A + }; +}; + +struct S4 { + enum [[deprecated]] B { + A + }; +}; + +void +g () +{ + S::B a1; // { dg-warning "is deprecated" } + S2::B a2; // { dg-warning "is deprecated" } + S3::B a3; // { dg-warning "is deprecated" } + S4::B a4; // { dg-warning "is deprecated" } +}