From patchwork Fri Dec 8 17:53:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 175982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5619101vqy; Fri, 8 Dec 2023 09:53:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/OH91rMy/cysUohmaK1/0+wY1QhCFkaUWoSmKYneevbYHolZxLiY6mdekaDHdAEU+Qrsy X-Received: by 2002:a25:8690:0:b0:db7:dacf:2f29 with SMTP id z16-20020a258690000000b00db7dacf2f29mr277291ybk.112.1702058014688; Fri, 08 Dec 2023 09:53:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702058014; cv=pass; d=google.com; s=arc-20160816; b=0QTya6xGUUgrwrTSxhk/2Rs0QhhThZjmS5xtXKss9GfRhhW8W5w0rsIt8n04tLXSQV 2BjcEh9BJUVM23qnvWDQg2wzQJRqHxGm7fa6icFWmw/KCmdZS8e8ARLodfmJoNXX9hK4 qCVYHUlypEw6snYD02yvHjw+Dp/fUeOUFFw2gk1aNPnK2Q1tCOlgrtLWcGwGWsIjbH9k 2dw5RxC26fKSX69/jr56bw3JWDABFxHvzRQm2Xem54fkArBhmt6kbpi1/kz5rcM+Vt9I W0DBsr1kNmSECRy8Hm7K1U6BYwSh1oKdzZCZcXqegiqSGYpZZO9p+1m39+RclFWZIMCa OyEw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=FNSAwhR7AgZ7MGeTqhYYF9wzFvowljIWchOhscjLgFs=; fh=0xZT+NBKSeH8qOu04/61f1ZGePpF4jF/gxp331YE14k=; b=A+hLHpmxoA9ZSScDR/eloTvQjiUfBETKqRNXmsxrVMfjCDlHbOGEjZfxuYeBxBCVqa iJBNi5NjD1UC4YYGFL+L0ItnxuDGxODMRtLi7pukKo58i4CNp2OrSSm78ST1ebBMJr73 9gdE/ibTquaZdwYN50UM0DvlM9htI9oIhe+Yu6i2em1Z7r0y7m+tt50TLrGY+MSW+6sm nFCOBKqGPs3GtR5wLW/lJ8XlMRgEmuOE2FOLpq1Le7YjPfNf/h6ZJGi52h6ow5JuqtZk +6sVD5JEArcpd2kr9ZRutGti4N7w+MsAJoRKXkSG71eDDZMahMEdKO6fErEQV3OCwWgV Lr8Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DKcZAzd5; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id s15-20020ad4500f000000b0067a9be03f83si213754qvo.501.2023.12.08.09.53.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 09:53:34 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DKcZAzd5; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 70EA33858419 for ; Fri, 8 Dec 2023 17:53:34 +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.129.124]) by sourceware.org (Postfix) with ESMTPS id 64D433858CD1 for ; Fri, 8 Dec 2023 17:53:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 64D433858CD1 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 64D433858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702057991; cv=none; b=v3/0Wd+G+xMs7E0ApSVRzSk7ntRWQcAVv1MoUbm4X/CIolDETZHxs0UmcxxVTKU/ngPe3hzieqSyE1YEaB59MUgOkLngw2nk7zLgyV0eTABBhIJn+O54TBri250Fjp5cXm4VVdji/Pq64hBKw6OMdOmXhOjHAG54EzO6LeBpz6I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702057991; c=relaxed/simple; bh=WHtGVpiP8e/M4WOwIziEHHmucL6sAhQcIMnINeOizvo=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=Xv/iab843uMKZd/e4gUuFuQl3o9NLOltSVH/qtU1EUCSQRcpbI2MxutzvslRjh+a8segQKcXJ17fKjo0ouXo/gZeTZXFOHgDPvgK/1GlIWh3i7kqxmG9HnN+71BYCM+WShsp9FUAZ2ydLnm1lL2cUnoF+gPW3jdAL116cwm4jTI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702057989; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=FNSAwhR7AgZ7MGeTqhYYF9wzFvowljIWchOhscjLgFs=; b=DKcZAzd5sX66oOhbcl3I8d0i8iD3QgQMnFBurzptCUrVshum8NNdRqoDHVLWkzRjRDH2cc uovihl03j0SFz++A1kI6OyMAOBvo+ooUjvWlIGOIvZhweR3Yu4qVGbVa1+u7gZtM3J+r0i MYHFERxSXOxSpKkIzp0eGY/qDwkNP/w= 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-491-2LWuhFwNO96-F6M7Lz7HOw-1; Fri, 08 Dec 2023 12:53:04 -0500 X-MC-Unique: 2LWuhFwNO96-F6M7Lz7HOw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 61C9D101CC74 for ; Fri, 8 Dec 2023 17:53:04 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.195.157]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3A2B8D2A; Fri, 8 Dec 2023 17:53:03 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 3B8Hr1uV2941887 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 8 Dec 2023 18:53:01 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 3B8Hr0LZ2941886; Fri, 8 Dec 2023 18:53:00 +0100 Date: Fri, 8 Dec 2023 18:53:00 +0100 From: Jakub Jelinek To: Jason Merrill Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] c++, v2: Don't diagnose ignoring of attributes if all ignored attributes are attribute_ignored_p Message-ID: References: <5e2e9627-5565-425d-9def-e1968c515b67@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_SHORT, 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: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784737184737913552 X-GMAIL-MSGID: 1784737184737913552 On Fri, Dec 08, 2023 at 12:06:01PM -0500, Jason Merrill wrote: > > @@ -21111,7 +21116,7 @@ cp_parser_elaborated_type_specifier (cp_ > > } > > else if (is_declaration && cp_parser_declares_only_class_p (parser)) > > cplus_decl_attributes (&type, attributes, (int) ATTR_FLAG_TYPE_IN_PLACE); > > - else > > + else if (any_nonignored_attribute_p (attributes)) > > warning (OPT_Wattributes, > > "attributes ignored on elaborated-type-specifier that is " > > "not a forward declaration"); > > I believe this is also prohibited by > https://eel.is/c++draft/dcl.type.elab#3 You're right and there is also https://eel.is/c++draft/temp.spec#temp.explicit-3 which prohibits it for explicit template instantiations. > so I would leave all the warnings in this function alone. Ok. > > location_t attr_loc = declspecs->locations[ds_std_attribute]; > > - if (warning_at (attr_loc, OPT_Wattributes, "attribute ignored")) > > + if (any_nonignored_attribute_p (declspecs->std_attributes) > > + && warning_at (attr_loc, OPT_Wattributes, "attribute ignored")) > > inform (attr_loc, "an attribute that appertains to a type-specifier " > > "is ignored"); > > } > > This seems untested, e.g. > > int [[foo::bar]] i; Thanks. Here is an updated patch, so far tested with GXX_TESTSUITE_STDS=98,11,14,17,20,23,26 make check-g++ RUNTESTFLAGS="dg.exp='Wno-attributes*' ubsan.exp=Wno-attributes*" Ok for trunk if it passes full bootstrap/regtest? 2023-12-08 Jakub Jelinek gcc/ * attribs.h (any_nonignored_attribute_p): Declare. * attribs.cc (any_nonignored_attribute_p): New function. gcc/cp/ * parser.cc (cp_parser_statement, cp_parser_expression_statement, cp_parser_declaration, cp_parser_asm_definition): Don't diagnose ignored attributes if !any_nonignored_attribute_p. * decl.cc (grokdeclarator): Likewise. * name-lookup.cc (handle_namespace_attrs, finish_using_directive): Don't diagnose ignoring of attr_ignored_p attributes. gcc/testsuite/ * g++.dg/warn/Wno-attributes-1.C: New test. Jakub --- gcc/attribs.h.jj 2023-12-06 12:03:27.421176109 +0100 +++ gcc/attribs.h 2023-12-06 12:36:55.704884514 +0100 @@ -48,6 +48,7 @@ extern void apply_tm_attr (tree, tree); extern tree make_attribute (const char *, const char *, tree); extern bool attribute_ignored_p (tree); extern bool attribute_ignored_p (const attribute_spec *const); +extern bool any_nonignored_attribute_p (tree); extern struct scoped_attributes * register_scoped_attributes (const scoped_attribute_specs &, bool = false); --- gcc/attribs.cc.jj 2023-12-06 12:03:27.386176602 +0100 +++ gcc/attribs.cc 2023-12-06 12:36:55.704884514 +0100 @@ -584,6 +584,19 @@ attribute_ignored_p (const attribute_spe return as->max_length == -2; } +/* Return true if the ATTRS chain contains at least one attribute which + is not ignored. */ + +bool +any_nonignored_attribute_p (tree attrs) +{ + for (tree attr = attrs; attr; attr = TREE_CHAIN (attr)) + if (!attribute_ignored_p (attr)) + return true; + + return false; +} + /* See whether LIST contains at least one instance of attribute ATTR (possibly with different arguments). Return the first such attribute if so, otherwise return null. */ --- gcc/cp/parser.cc.jj 2023-12-06 12:03:27.502174967 +0100 +++ gcc/cp/parser.cc 2023-12-06 12:36:55.704884514 +0100 @@ -12778,9 +12778,8 @@ cp_parser_statement (cp_parser* parser, SET_EXPR_LOCATION (statement, statement_location); /* Allow "[[fallthrough]];" or "[[assume(cond)]];", but warn otherwise. */ - if (std_attrs != NULL_TREE) - warning_at (attrs_loc, - OPT_Wattributes, + if (std_attrs != NULL_TREE && any_nonignored_attribute_p (std_attrs)) + warning_at (attrs_loc, OPT_Wattributes, "attributes at the beginning of statement are ignored"); } @@ -12986,7 +12985,7 @@ cp_parser_expression_statement (cp_parse } /* Allow "[[fallthrough]];", but warn otherwise. */ - if (attr != NULL_TREE) + if (attr != NULL_TREE && any_nonignored_attribute_p (attr)) warning_at (loc, OPT_Wattributes, "attributes at the beginning of statement are ignored"); @@ -15191,7 +15190,7 @@ cp_parser_declaration (cp_parser* parser } } - if (std_attrs != NULL_TREE && !attribute_ignored_p (std_attrs)) + if (std_attrs != NULL_TREE && any_nonignored_attribute_p (std_attrs)) warning_at (make_location (attrs_loc, attrs_loc, parser->lexer), OPT_Wattributes, "attribute ignored"); if (cp_lexer_next_token_is (parser->lexer, CPP_SEMICOLON)) @@ -22672,7 +22671,7 @@ cp_parser_asm_definition (cp_parser* par symtab->finalize_toplevel_asm (string); } - if (std_attrs) + if (std_attrs && any_nonignored_attribute_p (std_attrs)) warning_at (asm_loc, OPT_Wattributes, "attributes ignored on % declaration"); } --- gcc/cp/decl.cc.jj 2023-12-06 12:03:27.483175235 +0100 +++ gcc/cp/decl.cc 2023-12-06 12:36:55.698884598 +0100 @@ -13058,7 +13058,8 @@ grokdeclarator (const cp_declarator *dec && !diagnose_misapplied_contracts (declspecs->std_attributes)) { location_t attr_loc = declspecs->locations[ds_std_attribute]; - if (warning_at (attr_loc, OPT_Wattributes, "attribute ignored")) + if (any_nonignored_attribute_p (declspecs->std_attributes) + && warning_at (attr_loc, OPT_Wattributes, "attribute ignored")) inform (attr_loc, "an attribute that appertains to a type-specifier " "is ignored"); } --- gcc/cp/name-lookup.cc.jj 2023-12-06 12:03:27.495175066 +0100 +++ gcc/cp/name-lookup.cc 2023-12-06 12:36:55.695884641 +0100 @@ -6356,7 +6356,7 @@ handle_namespace_attrs (tree ns, tree at DECL_ATTRIBUTES (ns) = tree_cons (name, args, DECL_ATTRIBUTES (ns)); } - else + else if (!attribute_ignored_p (d)) { warning (OPT_Wattributes, "%qD attribute directive ignored", name); @@ -8703,7 +8703,7 @@ finish_using_directive (tree target, tre diagnosed = true; } } - else + else if (!attribute_ignored_p (a)) warning (OPT_Wattributes, "%qD attribute directive ignored", name); } } --- gcc/testsuite/g++.dg/warn/Wno-attributes-1.C.jj 2023-12-06 14:27:29.006249075 +0100 +++ gcc/testsuite/g++.dg/warn/Wno-attributes-1.C 2023-12-08 18:50:36.077628959 +0100 @@ -0,0 +1,52 @@ +// { dg-do compile { target c++11 } } +// { dg-options "-Wno-attributes=bar:: -Wno-attributes=baz::qux" } + +[[foo::bar]]; // { dg-warning "attribute ignored" } +[[bar::foo, foo::bar, baz::qux]]; // { dg-warning "attribute ignored" } +[[bar::foo, bar::bar, baz::qux]]; // { dg-bogus "attribute ignored" } + +namespace [[foo::bar]] N { // { dg-warning "'bar' attribute directive ignored" } + int n; +} +namespace [[bar::foo, foo::bar, baz::qux]] O { // { dg-warning "'bar' attribute directive ignored" } + int o; +} +namespace [[bar::foo, bar::bar, baz::qux]] P { // { dg-bogus "attribute directive ignored" } + int p; +} + +void +foo () +{ + int i = 0; + [[foo::bar]]; // { dg-warning "attributes at the beginning of statement are ignored" } + [[bar::foo, foo::bar, baz::qux]]; // { dg-warning "attributes at the beginning of statement are ignored" } + [[bar::foo, bar::bar, baz::qux]]; // { dg-bogus "attributes at the beginning of statement are ignored" } + [[foo::bar]] ++i; // { dg-warning "attributes at the beginning of statement are ignored" } + [[bar::foo, foo::bar, baz::qux]] ++i; // { dg-warning "attributes at the beginning of statement are ignored" } + [[bar::foo, bar::bar, baz::qux]] ++i; // { dg-bogus "attributes at the beginning of statement are ignored" } + [[foo::bar]] asm (""); // { dg-warning "attributes ignored on 'asm' declaration" } + [[bar::foo, foo::bar, baz::qux]] asm (""); // { dg-warning "attributes ignored on 'asm' declaration" } + [[bar::foo, bar::bar, baz::qux]] asm (""); // { dg-bogus "attributes ignored on 'asm' declaration" } + [[foo::bar]] using namespace N; // { dg-warning "'bar' attribute directive ignored" } + [[bar::foo, foo::bar, baz::qux]] using namespace O; // { dg-warning "'bar' attribute directive ignored" } + [[bar::foo, bar::bar, baz::qux]] using namespace P; // { dg-bogus "attribute directive ignored" } +} + +class S +{ + [[foo::bar]] friend int bar (S &); // { dg-warning "attribute ignored" } + // { dsg-message "an attribute that appertains to a friend declaration that is not a definition is ignored" "" { target *-*-* } .-1 } + [[bar::foo, foo::bar, baz::qux]] friend int baz (S &); // { dg-warning "attribute ignored" } + // { dsg-message "an attribute that appertains to a friend declaration that is not a definition is ignored" "" { target *-*-* } .-1 } + [[bar::foo, bar::bar, baz::qux]] friend int qux (S &); // { dg-warning "attribute ignored" } + // { dsg-message "an attribute that appertains to a friend declaration that is not a definition is ignored" "" { target *-*-* } .-1 } +public: + int s; +}; + +int [[foo::bar]] i; // { dg-warning "attribute ignored" } + // { dg-message "an attribute that appertains to a type-specifier is ignored" "" { target *-*-* } .-1 } +int [[bar::foo, foo::bar, baz::qux]] j; // { dg-warning "attribute ignored" } + // { dg-message "an attribute that appertains to a type-specifier is ignored" "" { target *-*-* } .-1 } +int [[bar::foo, bar::bar, baz::qux]] k; // { dg-bogus "attribute ignored" }