From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 7D2B83858C83 for ; Mon, 28 Feb 2022 16:13:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7D2B83858C83 Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-220-e8A9SmjAOiuE0n7SQ2iz0A-1; Mon, 28 Feb 2022 11:13:40 -0500 X-MC-Unique: e8A9SmjAOiuE0n7SQ2iz0A-1 Received: by mail-qv1-f72.google.com with SMTP id d15-20020a0cb2cf000000b00432e2ddeefaso7028772qvf.23 for ; Mon, 28 Feb 2022 08:13:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:cc:from:in-reply-to :content-transfer-encoding; bh=QaschgZVFrE+IHf9YM2vGup0mQWQZ5M6EuMn5c7fXiM=; b=SgNWGGdLGulNzP2rM/f9e3RXUVaCrnGj9IV2Pppbz7RCC/OYrMRfJif7x3SwhwOt8+ SWZUl2zEe6WIxGkJMeSOG/h1WLgp7mfogcEU5OfxeBOgKaLzd7F9Ot2V8yEF20BCHj/z B2RDA8+WJYQgLrj9kdJE5aMN0vRVfI3VHFs8F5ga6we7clsDeceXaaRdcBBEWlwsVrLu Jba2RmBWJP57gz05GhNCAyqB0FDKZPDYwdBIMzKjWUN7D3+uW9MdhVXmmtRq1gQmZCVS L4tGDHYTKawjCY0OADv1YpGrItZQ38MI38qDKwlkYk9pljczd6UMXevqAgabQCzzcvuq c7Zg== X-Gm-Message-State: AOAM5336gbYxC2m26Xecs+p4xOR+I7o4/+F7LsfcnDXirZuD9UP1jhfC s7id63S0Is2rAbEjlEw/OtKiA5QQpzJn/sXOy5KS39dc3oQKB51zzrDoGeqs2wE8inmmWu+9ZMb XGXL6Ted10JdvNLJuHg== X-Received: by 2002:ac8:5e49:0:b0:2de:90a8:307e with SMTP id i9-20020ac85e49000000b002de90a8307emr17061849qtx.671.1646064819471; Mon, 28 Feb 2022 08:13:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9Fl6GUC+f0j+GlCiHFJ3MaqhsAnGoLfOK7x36wE2v3LZJjm8pzpcHXqFuW9U3mXetwZ0NGA== X-Received: by 2002:ac8:5e49:0:b0:2de:90a8:307e with SMTP id i9-20020ac85e49000000b002de90a8307emr17061823qtx.671.1646064819040; Mon, 28 Feb 2022 08:13:39 -0800 (PST) Received: from [192.168.1.58] ([70.45.227.144]) by smtp.gmail.com with ESMTPSA id z196-20020a3765cd000000b0050848cdb596sm5171054qkb.101.2022.02.28.08.13.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Feb 2022 08:13:38 -0800 (PST) Message-ID: <97974b6a-98ec-6753-07ea-ff96ba15e92f@redhat.com> Date: Mon, 28 Feb 2022 12:13:36 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH] c++: Lost deprecated/unavailable attr in class tmpl [PR104682] To: Marek Polacek , GCC Patches References: <20220225215921.324060-1-polacek@redhat.com> Cc: Iain Sandoe From: Jason Merrill In-Reply-To: <20220225215921.324060-1-polacek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, 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-List-Received-Date: Mon, 28 Feb 2022 16:13:46 -0000 On 2/25/22 17:59, Marek Polacek wrote: > [ 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: Iain, was this difference intentional? > 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. This looks extremely safe, so let's go ahead and apply it to trunk. > 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 > > 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" } > +} > > base-commit: f62115c9b770a66c5378f78a2d5866243d560573