aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorRichard Biener <rguenth@gcc.gnu.org>2012-06-06 12:22:16 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2012-06-06 12:22:16 +0000
commitce6d2586b573b25174238dd7918acfc09b937d7e (patch)
tree552f0b88f839aa1d8da5dbd3bac5a8d8493993ec /gcc/cp
parentd0582dc1815c0fb684b97dc88f3a3152d5f517f7 (diff)
downloadgcc-ce6d2586b573b25174238dd7918acfc09b937d7e.zip
gcc-ce6d2586b573b25174238dd7918acfc09b937d7e.tar.gz
gcc-ce6d2586b573b25174238dd7918acfc09b937d7e.tar.bz2
re PR c++/52841 (error: type 'Solvable' is not a base type for type 'Resolvable')
2012-06-06 Fabien Chene <fabien@gcc.gnu.org> PR c++/52841 * parser.c (cp_parser_alias_declaration): Return earlier if an error occured. * g++.dg/cpp0x/pr52841.C: New testcase. From-SVN: r188264
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f473e2c..cd983fa 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-06 Fabien Chêne <fabien@gcc.gnu.org>
+
+ PR c++/52841
+ * parser.c (cp_parser_alias_declaration): Return earlier
+ if an error occured.
+
2012-06-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/53524
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2afcbc0..5256d01 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -15061,6 +15061,9 @@ cp_parser_alias_declaration (cp_parser* parser)
cp_parser_require (parser, CPP_EQ, RT_EQ);
+ if (cp_parser_error_occurred (parser))
+ return error_mark_node;
+
/* Now we are going to parse the type-id of the declaration. */
/*