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.129.124]) by sourceware.org (Postfix) with ESMTPS id 033A83858D28 for ; Wed, 27 Apr 2022 22:45:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 033A83858D28 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-107-aVFjR9KnPzqe9L0Q22FN-Q-1; Wed, 27 Apr 2022 18:45:32 -0400 X-MC-Unique: aVFjR9KnPzqe9L0Q22FN-Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E94A23C37F22 for ; Wed, 27 Apr 2022 22:45:31 +0000 (UTC) Received: from pdp-11.redhat.com (unknown [10.22.9.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA19AC2813D; Wed, 27 Apr 2022 22:45:31 +0000 (UTC) From: Marek Polacek To: GCC Patches , Jason Merrill Subject: [PATCH] c++: global-namespace-qualified var after class def [PR90107] Date: Wed, 27 Apr 2022 18:45:26 -0400 Message-Id: <20220427224526.1107353-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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, 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-List-Received-Date: Wed, 27 Apr 2022 22:45:36 -0000 Here we wrongly reject the definition of "::N::a" struct A; namespace N { extern A a; } struct A {} ::N::a; because our code to diagnose a missing ; after a class definition doesn't realize that :: can follow a class definition. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk/11.4? PR c++/90107 gcc/cp/ChangeLog: * parser.cc (cp_parser_class_specifier_1): Accept :: after a class definition. gcc/testsuite/ChangeLog: * g++.dg/parse/qualified6.C: New test. --- gcc/cp/parser.cc | 1 + gcc/testsuite/g++.dg/parse/qualified6.C | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 gcc/testsuite/g++.dg/parse/qualified6.C diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 169e6a62f5f..2235da10c7c 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -25933,6 +25933,7 @@ cp_parser_class_specifier_1 (cp_parser* parser) case CPP_OPEN_PAREN: case CPP_CLOSE_PAREN: case CPP_COMMA: + case CPP_SCOPE: want_semicolon = false; break; diff --git a/gcc/testsuite/g++.dg/parse/qualified6.C b/gcc/testsuite/g++.dg/parse/qualified6.C new file mode 100644 index 00000000000..68b51f771ec --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/qualified6.C @@ -0,0 +1,10 @@ +// PR c++/90107 +// { dg-do compile } + +struct A; +namespace N { extern A a; } +struct A {} ::N::a; + +struct A1; +struct B { static A1 a1; }; +struct A1 {} ::B::a1; base-commit: 58e4a744b6e8140499ed6c33a8e9a6557e102f74 -- 2.35.1