From patchwork Fri Apr 29 14:12:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1624360 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=IMDWv4IA; 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 (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KqZGH2hhyz9s0r for ; Sat, 30 Apr 2022 00:13:25 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4B3653856DDC for ; Fri, 29 Apr 2022 14:13:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B3653856DDC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1651241603; bh=c5OAtb9vWuJ7RA5moDzi6t9eVAELIvU7jT6Yup5Eeus=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=IMDWv4IASy1NBzxNzLba6if/nUrwEOOTX5VpvWriAWMi0sOGIDX145ipxDl8T8Z1C l20g6lyvt2s18XczWGyZNtZwZuzVThovTHolDOGxs+Pi33wGDpsiM9s6wsNbqtyPtE MumnAbRcWO5xTJmMbqj4t7WCX1aQc9DsEsXo4qe0= 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 DA318385380D for ; Fri, 29 Apr 2022 14:12:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DA318385380D Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-2R3AQ79cOrOHSI-btH0d_A-1; Fri, 29 Apr 2022 10:12:27 -0400 X-MC-Unique: 2R3AQ79cOrOHSI-btH0d_A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CD010811E80 for ; Fri, 29 Apr 2022 14:12:26 +0000 (UTC) Received: from pdp-11.redhat.com (unknown [10.22.17.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC623112C071; Fri, 29 Apr 2022 14:12:23 +0000 (UTC) To: GCC Patches , Jason Merrill Subject: [PATCH] c++: pedwarn for empty unnamed enum in decl [PR67048] Date: Fri, 29 Apr 2022 10:12:18 -0400 Message-Id: <20220429141218.41850-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 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, 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 Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" [dcl.dcl]/5 says that enum { }; is ill-formed, and since r197742 we issue a pedwarn. However, the pedwarn also fires for enum { } x; which is well-formed. So only warn when {} is followed by a ;. This should be correct since you can't have "enum {}, " -- that produces "expected unqualified-id before ',' token". Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? I think this could go to 12.2 and 11.4 too. PR c++/67048 gcc/cp/ChangeLog: * parser.cc (cp_parser_enum_specifier): Warn about empty unnamed enum only when it's followed by a semicolon. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/enum42.C: New test. --- gcc/cp/parser.cc | 4 +++- gcc/testsuite/g++.dg/cpp0x/enum42.C | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/enum42.C base-commit: 9ae8b993cd362e8aea4f65580aaf1453120207f2 diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 2235da10c7c..0fa37fdfb66 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -21007,7 +21007,9 @@ cp_parser_enum_specifier (cp_parser* parser) /* If the next token is not '}', then there are some enumerators. */ else if (cp_lexer_next_token_is (parser->lexer, CPP_CLOSE_BRACE)) { - if (is_unnamed && !scoped_enum_p) + if (is_unnamed && !scoped_enum_p + /* Don't warn for enum {} a; here. */ + && cp_lexer_nth_token_is (parser->lexer, 2, CPP_SEMICOLON)) pedwarn (type_start_token->location, OPT_Wpedantic, "ISO C++ forbids empty unnamed enum"); } diff --git a/gcc/testsuite/g++.dg/cpp0x/enum42.C b/gcc/testsuite/g++.dg/cpp0x/enum42.C new file mode 100644 index 00000000000..05b372a1947 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/enum42.C @@ -0,0 +1,7 @@ +// PR c++/67048 +// { dg-do compile { target c++11 } } +// { dg-options -Wpedantic } + +typedef enum {} X; +enum {} x; +enum {} y, z;