* parser.c (cp_parser_enum_specifier): Check for error_mark_node.

From-SVN: r195818
R-macos · Feb 6, 2013 · ceb8649 · ceb8649
1 parent 828e50c
commit ceb8649
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-06  Jason Merrill  <[email protected]>
+
+	* parser.c (cp_parser_enum_specifier): Check for error_mark_node.
+
 2013-02-05  Jason Merrill  <[email protected]>
 
 	PR c++/54122

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
@@ -14567,7 +14567,7 @@ cp_parser_enum_specifier (cp_parser* parser)
 				     /*check_dependency=*/true,
 				     /*ambiguous_decls=*/NULL,
 				     input_location);
-      if (name)
+      if (name && name != error_mark_node)
 	{
 	  type = TREE_TYPE (name);
 	  if (TREE_CODE (type) == TYPENAME_TYPE)

diff --git a/gcc/testsuite/g++.dg/parse/enum10.C b/gcc/testsuite/g++.dg/parse/enum10.C
@@ -0,0 +1,2 @@
+namespace A { }
+enum A::B { };			// { dg-error "" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		namespace A { }
		enum A::B { }; // { dg-error "" }