Re: [PATCH] c++: global-namespace-qualified var after class def [PR90107]

[Jason Merrill via Gcc-patches]

On 4/27/22 18:45, Marek Polacek wrote:

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?

OK.

        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