]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
* parser.c (cp_parser_enum_specifier): Check for error_mark_node.
authorJason Merrill <jason@redhat.com>
Wed, 6 Feb 2013 20:58:32 +0000 (15:58 -0500)
committerJason Merrill <jason@gcc.gnu.org>
Wed, 6 Feb 2013 20:58:32 +0000 (15:58 -0500)
From-SVN: r195818

gcc/cp/ChangeLog
gcc/cp/parser.c
gcc/testsuite/g++.dg/parse/enum10.C [new file with mode: 0644]

index a5f944bc08db860caef4db42677ef7f0dbcb69d6..f60735d61659ff1462075dec2c3b3b7a4097f28b 100644 (file)
@@ -1,3 +1,7 @@
+2013-02-06  Jason Merrill  <jason@redhat.com>
+
+       * parser.c (cp_parser_enum_specifier): Check for error_mark_node.
+
 2013-02-05  Jason Merrill  <jason@redhat.com>
 
        PR c++/54122
index 74db9aef3e0c19cbbb61d1219602cd615198c678..72da561c357d8bc358d7fb1d6ccf76db9ea4a455 100644 (file)
@@ -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
new file mode 100644 (file)
index 0000000..8760597
--- /dev/null
@@ -0,0 +1,2 @@
+namespace A { }
+enum A::B { };                 // { dg-error "" }