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 AC6B3385802E for ; Tue, 8 Mar 2022 19:48:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AC6B3385802E 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-46-WbJL-I4YOJWlUMgsEQcaPA-1; Tue, 08 Mar 2022 14:48:31 -0500 X-MC-Unique: WbJL-I4YOJWlUMgsEQcaPA-1 Received: by mail-qk1-f197.google.com with SMTP id q24-20020a05620a0c9800b0060d5d0b7a90so15060375qki.11 for ; Tue, 08 Mar 2022 11:48:31 -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:from:in-reply-to :content-transfer-encoding; bh=DhW0F+5tAkeA+swkCiuXhfvseyJUDABr0eCB3Uate24=; b=BD06dgDpNevqzocqtLirSklYJz1raBH4+8GE7goKSWu6pDovWJ5YQndFCEmBgPnwX7 /r/4gcWPMVX7+q8rAt/Xnw7WNGagavDOJjNOSirxYaZxmukOVnsUGPX5Bqs1/PWX1c/D Trr1sKoq5oHC82P1Z9i26nz6YhJj1ltNiBRLNf8NEPakOFgcNk+gxWKS8wd6tIfRXvh6 EnppPkLZA/EeMf8Q2XoH/za31rXQWDp+SfS3xy8lUV5ZAn12EmKmCLF3wZXu4mc+upwf GPFPL6iV7og7qBMuYpb5Xyz+yrNAp0HyzJEm12vNz+jFrc5hyRXqnsIaVwCJY2elffiH ZU0A== X-Gm-Message-State: AOAM5314oQ21pT/ZAYx381Yu240AY2PlfVTcC5yWNNxhvL39zShWsmrA DJC7G/6ykp+ycJj6AUngzHdrYX+/RI3pD0aP2n7vVV9YqLt3UHbWGjiR/9DVTSeaWdJQXptFWeq jhnafb1Umi6+f/KnVPw== X-Received: by 2002:a05:620a:24d6:b0:67d:177f:3464 with SMTP id m22-20020a05620a24d600b0067d177f3464mr3145541qkn.47.1646768910525; Tue, 08 Mar 2022 11:48:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIBKKpVfucZlRPagwK9lyg+7xIUuBXJzcSt+bBhA7d+5keHHMvfRAsSEQ9GU+S+o6aMu5J6g== X-Received: by 2002:a05:620a:24d6:b0:67d:177f:3464 with SMTP id m22-20020a05620a24d600b0067d177f3464mr3145532qkn.47.1646768910180; Tue, 08 Mar 2022 11:48:30 -0800 (PST) Received: from [192.168.1.149] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id ay35-20020a05620a17a300b00648cc8356e2sm8109208qkb.9.2022.03.08.11.48.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Mar 2022 11:48:29 -0800 (PST) Message-ID: Date: Tue, 8 Mar 2022 14:48:25 -0500 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++: Attribute deprecated/unavailable divergence To: Marek Polacek , GCC Patches References: <20220302183106.355982-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: <20220302183106.355982-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=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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: Tue, 08 Mar 2022 19:48:35 -0000 On 3/2/22 14:31, Marek Polacek wrote: > Attributes deprecated and unavailable are largely the same, except > that the former produces a warning whereas the latter produces an error. > So is_late_template_attribute should treat them the same. Confirmed by > Iain that this divergence is not intentional: > . > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk or defer to GCC 13? OK. > gcc/cp/ChangeLog: > > * decl2.cc (is_late_template_attribute): Do not defer attribute > unavailable. > * pt.cc (tsubst_enum): Set TREE_UNAVAILABLE. > > gcc/testsuite/ChangeLog: > > * g++.dg/ext/attr-unavailable-9.C: Add dg-error. > --- > gcc/cp/decl2.cc | 1 + > gcc/cp/pt.cc | 4 +--- > gcc/testsuite/g++.dg/ext/attr-unavailable-9.C | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc > index 22edc2ba7f9..2752426546c 100644 > --- a/gcc/cp/decl2.cc > +++ b/gcc/cp/decl2.cc > @@ -1314,6 +1314,7 @@ is_late_template_attribute (tree attr, tree decl) > /* But some attributes specifically apply to templates. */ > && !is_attribute_p ("abi_tag", name) > && !is_attribute_p ("deprecated", name) > + && !is_attribute_p ("unavailable", name) > && !is_attribute_p ("visibility", name)) > return true; > else > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index 8fb17349ee1..853738410be 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -26976,9 +26976,7 @@ 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. */ > + TREE_UNAVAILABLE (newtag) = TREE_UNAVAILABLE (tag); > } > > /* DECL is a FUNCTION_DECL that is a template specialization. Return > diff --git a/gcc/testsuite/g++.dg/ext/attr-unavailable-9.C b/gcc/testsuite/g++.dg/ext/attr-unavailable-9.C > index 44161336e78..6df55d534f8 100644 > --- a/gcc/testsuite/g++.dg/ext/attr-unavailable-9.C > +++ b/gcc/testsuite/g++.dg/ext/attr-unavailable-9.C > @@ -3,10 +3,10 @@ > /* { dg-options "" } */ > > template struct __attribute__ ((unavailable)) S {}; > -S s; > +S s; // { dg-error "unavailable" } > > template