From patchwork Fri Dec 17 22:56:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1570395 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=fo8G/DUA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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 4JG49K4Fftz9sXM for ; Sat, 18 Dec 2021 09:56:36 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F7623858035 for ; Fri, 17 Dec 2021 22:56:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F7623858035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1639781792; bh=01f/xrMxcR6+74eN0THhhnjwyjvxZ32cZVGCD0LdIWI=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=fo8G/DUAhTBQDlEqNajwdJJrzKkgNaSgQkq0N/px4Wse5hqNIsw5zARm+OohvCYN1 iaLQDTgkdtwrB/oXPPJmv1t8zgC6cJ+aRjpXmWRJ8Oj1X/FZu6bO4akyCOFDUfyr2F X0ze4Aga5WUD+fj93rzfPtGDtCLI1Bw7guIfXSU0= 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 94FFD3858407 for ; Fri, 17 Dec 2021 22:56:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 94FFD3858407 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-387-PQ3GMh8VPLGlDJdFg39C4w-1; Fri, 17 Dec 2021 17:56:09 -0500 X-MC-Unique: PQ3GMh8VPLGlDJdFg39C4w-1 Received: by mail-qk1-f199.google.com with SMTP id bs14-20020a05620a470e00b0046b1e29f53cso1941662qkb.0 for ; Fri, 17 Dec 2021 14:56:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=01f/xrMxcR6+74eN0THhhnjwyjvxZ32cZVGCD0LdIWI=; b=Ils8/cvhfFK6YTdeL9iH1Khlm0LovfXyzmzFghyD2DquxOKpdk9c4jXUqMw/1rXMUp CZPHu5AqsA6gptwziWupy2RqtjFTWm90Q9rYKRuPifyWMC6+nnLHPNn3ggft6lt1463B 5e7Sp+zFH39rHSw0DkKpzk8fCzFTV2dC6W+SGdfnPzwGHOrR7zDcjSXAVgyZE33GQ6i5 LRBmGn+GRDDtlV+RgqKCh4w3VLALS0DvU5KpGnn5KxTPt0VUuxggaAR/SN6bNtmutsRH u8K2MbQdIVV04zT1A4VfhN7kMfAFoG1XeiOZEE5bylsuariBSU6kYEAT/uzBtE7bWFO/ 5FQw== X-Gm-Message-State: AOAM533xTkOPaB7CRKwFp857cdGVwRNiVJadaSwRE+JjVq5W8LZFoWCL 1fLkgzRlvORf8UKRkNIdy41KIXFvDz0HXhBRH0TlXgsp/y+cfqspvxaXuaCBDp92IIuAKsRRmu+ lowBUYbpmAgCM0bltQg== X-Received: by 2002:a05:622a:2d5:: with SMTP id a21mr4395488qtx.509.1639781769171; Fri, 17 Dec 2021 14:56:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyYreVt4/Z4vIJNoIlzijZWDj2UwS8womNbFu5tlvK8W/yBmmGyvtw8UsgGYtglFkie2AroTA== X-Received: by 2002:a05:622a:2d5:: with SMTP id a21mr4395478qtx.509.1639781768864; Fri, 17 Dec 2021 14:56:08 -0800 (PST) Received: from redhat.com ([2601:184:4780:4310::aac2]) by smtp.gmail.com with ESMTPSA id bk39sm5685188qkb.35.2021.12.17.14.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 14:56:08 -0800 (PST) Date: Fri, 17 Dec 2021 17:56:06 -0500 To: Jason Merrill Subject: [PATCH v4] attribs: Fix wrong error with -Wno-attribute=A::b [PR103649] Message-ID: References: <20211216223555.820800-1-polacek@redhat.com> <20211216225346.GA2646553@tucnak> <7d088a03-cddc-9287-aae1-e32532a21f12@redhat.com> <6f8ef9bc-47c2-ccb5-6238-a039114d7047@redhat.com> MIME-Version: 1.0 In-Reply-To: <6f8ef9bc-47c2-ccb5-6238-a039114d7047@redhat.com> User-Agent: Mutt/2.1.3 (2021-09-10) X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-13.2 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_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP 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 Cc: Jakub Jelinek , GCC Patches , Joseph Myers Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" On Fri, Dec 17, 2021 at 02:33:01PM -0500, Jason Merrill wrote: > On 12/17/21 13:14, Marek Polacek wrote: > > @@ -28979,7 +28979,9 @@ cp_parser_std_attribute (cp_parser *parser, tree attr_ns) > > /* A GNU attribute that takes an identifier in parameter. */ > > attr_flag = id_attr; > > - if (as == NULL) > > + /* When MAX_LENGTH is -2, this is a fake attribute created to > > + handle -Wno-attributes, and we must skip parsing the arguments. */ > > + if (as == NULL || as->max_length == -2) > > Rather than require multiple places to know about the magic -2, could we > have an overload of attribute_ignored_p that takes an attribute_spec*? OK > with that change. Sure, here's what I'm pushing: Tested x86_64-pc-linux-gnu, applying to trunk. -- >8 -- My patch to implement -Wno-attribute=A::b caused a bogus error when parsing [[foo::bar(1, 2)]]; when -Wno-attributes=foo::bar was specified on the command line, because when we create a fake foo::bar attribute and insert it into our attribute table, it is created with max_length == 0 which doesn't allow any args. That is wrong -- we know nothing about the attribute, so we shouldn't require any specific number of arguments. And since unknown attributes can be rather complex (see for example omp::{directive,sequence}), we must skip parsing their arguments. To that end, I'm using max_length with value -2. Also let's not warn about things like [[vendor::assume(true)]]; because they may have some meaning (this is reminiscent of C++ Portable Assumptions). PR c/103649 gcc/ChangeLog: * attribs.c (handle_ignored_attributes_option): Create the fake attribute with max_length == -2. (attribute_ignored_p): New overloads. * attribs.h (attribute_ignored_p): Declare them. * tree-core.h (struct attribute_spec): Document that max_length can be -2. gcc/c/ChangeLog: * c-decl.c (c_warn_unused_attributes): Don't warn for attribute_ignored_p. * c-parser.c (c_parser_std_attribute): Skip parsing of the attribute arguments when the attribute is ignored. gcc/cp/ChangeLog: * parser.c (cp_parser_declaration): Don't warn for attribute_ignored_p. (cp_parser_std_attribute): Skip parsing of the attribute arguments when the attribute is ignored. gcc/testsuite/ChangeLog: * c-c++-common/Wno-attributes-6.c: New test. --- gcc/attribs.c | 28 ++++++++++++++++++- gcc/attribs.h | 2 ++ gcc/c/c-decl.c | 2 +- gcc/c/c-parser.c | 4 ++- gcc/cp/parser.c | 6 ++-- gcc/testsuite/c-c++-common/Wno-attributes-6.c | 16 +++++++++++ gcc/tree-core.h | 4 ++- 7 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/Wno-attributes-6.c base-commit: d7ca2a79b82c6500ead6ab983d14c609e2124eee diff --git a/gcc/attribs.c b/gcc/attribs.c index 29703e75fba..9e7b7c1abd2 100644 --- a/gcc/attribs.c +++ b/gcc/attribs.c @@ -304,7 +304,7 @@ handle_ignored_attributes_option (vec *v) We can't free it here, so squirrel away the pointers. */ attribute_spec *table = new attribute_spec[2]; ignored_attributes_table.safe_push (table); - table[0] = { attr, 0, 0, false, false, false, false, nullptr, nullptr }; + table[0] = { attr, 0, -2, false, false, false, false, nullptr, nullptr }; table[1] = { nullptr, 0, 0, false, false, false, false, nullptr, nullptr }; register_scoped_attributes (table, IDENTIFIER_POINTER (vendor_id), !attr); @@ -569,6 +569,32 @@ attr_namespace_ignored_p (tree ns) return r && r->ignored_p; } +/* Return true if the attribute ATTR should not be warned about. */ + +bool +attribute_ignored_p (tree attr) +{ + if (!cxx11_attribute_p (attr)) + return false; + if (tree ns = get_attribute_namespace (attr)) + { + if (attr_namespace_ignored_p (ns)) + return true; + const attribute_spec *as = lookup_attribute_spec (TREE_PURPOSE (attr)); + if (as && as->max_length == -2) + return true; + } + return false; +} + +/* Like above, but takes an attribute_spec AS, which must be nonnull. */ + +bool +attribute_ignored_p (const attribute_spec *const as) +{ + return as->max_length == -2; +} + /* Process the attributes listed in ATTRIBUTES and install them in *NODE, which is either a DECL (including a TYPE_DECL) or a TYPE. If a DECL, it should be modified in place; if a TYPE, a copy should be created diff --git a/gcc/attribs.h b/gcc/attribs.h index f5899d83c0b..4928b126f59 100644 --- a/gcc/attribs.h +++ b/gcc/attribs.h @@ -39,6 +39,8 @@ extern tree get_attribute_name (const_tree); extern tree get_attribute_namespace (const_tree); 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 struct scoped_attributes* register_scoped_attributes (const struct attribute_spec *, const char *, diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 4b5481ce8f4..516e3c26e21 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -4643,7 +4643,7 @@ c_warn_unused_attributes (tree attrs) constraint violation. */ pedwarn (input_location, OPT_Wattributes, "%qE attribute ignored", get_attribute_name (t)); - else + else if (!attribute_ignored_p (t)) warning (OPT_Wattributes, "%qE attribute ignored", get_attribute_name (t)); } diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index d7e5f051ac0..b09ad307acd 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -4943,7 +4943,9 @@ c_parser_std_attribute (c_parser *parser, bool for_tm) parens.skip_until_found_close (parser); return error_mark_node; } - if (as) + /* If this is a fake attribute created to handle -Wno-attributes, + we must skip parsing the arguments. */ + if (as && !attribute_ignored_p (as)) { bool takes_identifier = (ns != NULL_TREE diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 44eed7ea638..33fb40a5b59 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -14776,7 +14776,7 @@ cp_parser_declaration (cp_parser* parser, tree prefix_attrs) } } - if (std_attrs != NULL_TREE) + if (std_attrs != NULL_TREE && !attribute_ignored_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)) @@ -28979,7 +28979,9 @@ cp_parser_std_attribute (cp_parser *parser, tree attr_ns) /* A GNU attribute that takes an identifier in parameter. */ attr_flag = id_attr; - if (as == NULL) + /* If this is a fake attribute created to handle -Wno-attributes, + we must skip parsing the arguments. */ + if (as == NULL || attribute_ignored_p (as)) { if ((flag_openmp || flag_openmp_simd) && attr_ns == omp_identifier) { diff --git a/gcc/testsuite/c-c++-common/Wno-attributes-6.c b/gcc/testsuite/c-c++-common/Wno-attributes-6.c new file mode 100644 index 00000000000..ca3c7bebb99 --- /dev/null +++ b/gcc/testsuite/c-c++-common/Wno-attributes-6.c @@ -0,0 +1,16 @@ +/* PR c/103649 */ +/* { dg-do compile { target { c || c++11 } } } */ +/* { dg-additional-options "-Wno-attributes=foo::bar" } */ +/* { dg-additional-options "-Wno-attributes=baz::" } */ +/* { dg-additional-options "-Wno-attributes=womp::womp" } */ +/* { dg-additional-options "-Wno-attributes=qux::foo" } */ +/* { dg-additional-options "-Wno-attributes=vendor::assume" } */ + +[[vendor::assume(1 + 1 == 2)]]; +[[foo::bar(1, 2)]]; +[[baz::bar(1, 2)]]; +[[foo::bar(1, 2)]] void f1(); +[[baz::bar(1, 2)]] void f2(); +[[qux::foo({t})]] void f3(); +[[womp::womp (another::directive (threadprivate (t)))]] void f4(); +[[womp::womp (another::directive (threadprivate (t)))]]; diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 91ae5237d7e..9b37a065d18 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -2077,7 +2077,9 @@ struct attribute_spec { /* The minimum length of the list of arguments of the attribute. */ int min_length; /* The maximum length of the list of arguments of the attribute - (-1 for no maximum). */ + (-1 for no maximum). It can also be -2 for fake attributes + created for the sake of -Wno-attributes; in that case, we + should skip the balanced token sequence when parsing the attribute. */ int max_length; /* Whether this attribute requires a DECL. If it does, it will be passed from types of DECLs, function return types and array element types to