re PR c++/16637 (syntax error on valid input code)

	PR c++/16637
	* parser.c (cp_parser_simple_type_specifier): Do not record usage
	of globally-qualified names.

	PR c++/16637
	* g++.dg/parse/lookup4.C: New test.

From-SVN: r84965

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c05d91ffb72c8c8c8840fd9696f970b88699e70c..b4ebd70c931e7afb913d62e5e7dfdfe60c20791b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-20  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/16637
+       * parser.c (cp_parser_simple_type_specifier): Do not record usage
+       of globally-qualified names.
+
 2004-07-20  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/16175

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c60158cc446a079384732e4d93b368e74eaacc22..2cd9f510e9a20fd05d1c82c5fc17050719301a14 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9459,6 +9459,7 @@ cp_parser_simple_type_specifier (cp_parser* parser,
   if (!(flags & CP_PARSER_FLAGS_NO_USER_DEFINED_TYPES))
     {
       bool qualified_p;
+      bool global_p;
 
       /* Don't gobble tokens or issue error messages if this is an
         optional type-specifier.  */
@@ -9466,8 +9467,9 @@ cp_parser_simple_type_specifier (cp_parser* parser,
        cp_parser_parse_tentatively (parser);
 
       /* Look for the optional `::' operator.  */
-      cp_parser_global_scope_opt (parser,
-                                 /*current_scope_valid_p=*/false);
+      global_p
+       = cp_parser_global_scope_opt (parser,
+                                     /*current_scope_valid_p=*/false);
       /* Look for the nested-name specifier.  */
       qualified_p
        = (cp_parser_nested_name_specifier_opt (parser,
@@ -9499,6 +9501,7 @@ cp_parser_simple_type_specifier (cp_parser* parser,
        type = cp_parser_type_name (parser);
       /* Keep track of all name-lookups performed in class scopes.  */
       if (type
+         && !global_p
          && !qualified_p
          && TREE_CODE (type) == TYPE_DECL
          && TREE_CODE (DECL_NAME (type)) == IDENTIFIER_NODE)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 64de9d5c8b0207f476caade03cbd10f52dfc06ae..c47e7b7287b1f93c0d2fa8da6d590885d1c8c35a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-20  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/16637
+       * g++.dg/parse/lookup4.C: New test.
+
 2004-07-20  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/16175

diff --git a/gcc/testsuite/g++.dg/parse/lookup4.C b/gcc/testsuite/g++.dg/parse/lookup4.C
new file mode 100644 (file)
index 0000000..01e5662
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/lookup4.C
@@ -0,0 +1,7 @@
+// PR c++/16637
+
+typedef int I;
+
+struct S {
+  ::I I;
+};