parser.c (cp_parser_nested_name_specifier): Reset scope on failure.

cp:
	* parser.c (cp_parser_nested_name_specifier): Reset scope on
	failure.
	(cp_parser_elaborated_type_specifier): Likewise.
testsuite:
	* g++.dg/parse/crash10: New test.

From-SVN: r69702

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 982799147532ac0dbf2019fe6cde2843c724e452..45f17513aeec9c05b371ed2ad77548e9bbb0e127 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-23  Nathan Sidwell  <nathan@codesourcery.com>
+
+       PR c++/10953
+       * parser.c (cp_parser_nested_name_specifier): Reset scope on
+       failure.
+       (cp_parser_elaborated_type_specifier): Likewise.
+
 2003-07-22  Mark Mitchell  <mark@codesourcery.com>
 
        Eliminate use of POINTER_TYPE for pointers-to-members.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 3cef2e2257f755723ad8ac6607023bbf5ff43d46..5a7dc875bb9e55b045bd86bc8363380a8be50373 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3052,6 +3052,7 @@ cp_parser_nested_name_specifier (cp_parser *parser,
   if (!scope)
     {
       cp_parser_error (parser, "expected nested-name-specifier");
+      parser->scope = NULL_TREE;
       return error_mark_node;
     }
 
@@ -8439,7 +8440,10 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
       identifier = cp_parser_identifier (parser);
 
       if (identifier == error_mark_node)
-       return error_mark_node;
+       {
+         parser->scope = NULL_TREE;
+         return error_mark_node;
+       }
 
       /* For a `typename', we needn't call xref_tag.  */
       if (tag_type == typename_type)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 085f25d4ec54a5c4401665b505e623ce84c5150b..1667deac5e0bb0a21d547ef642be81e55e7df465 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-23  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * g++.dg/parse/crash10: New test.
+
 2003-07-22  Nathan Sidwell  <nathan@codesourcery.com>
 
        * g++.dg/ext/flexary1.C: New test.

diff --git a/gcc/testsuite/g++.dg/parse/crash10.C b/gcc/testsuite/g++.dg/parse/crash10.C
new file mode 100644 (file)
index 0000000..878139f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash10.C
@@ -0,0 +1,11 @@
+// { dg-do compile }
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 22 Jul 2003 <nathan@codesourcery.com>
+
+// PR c++ 10953. ICE
+
+class 
+{
+  typename::  // { dg-error "" "" }
+; // { dg-error "" "" }