aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorLee Millward <lee.millward@gmail.com>2006-07-15 15:00:28 +0000
committerLee Millward <lmillward@gcc.gnu.org>2006-07-15 15:00:28 +0000
commit31b29c620e4a7fe59b61d81ed9c13e89fe293b33 (patch)
treebaffa7f941c5afdca64b05aae9a72005557b5923 /gcc
parent662c2e83b15ffe993481b9af261462e9e4fa9095 (diff)
downloadgcc-31b29c620e4a7fe59b61d81ed9c13e89fe293b33.zip
gcc-31b29c620e4a7fe59b61d81ed9c13e89fe293b33.tar.gz
gcc-31b29c620e4a7fe59b61d81ed9c13e89fe293b33.tar.bz2
re PR c++/28269 (ICE on attribute for invalid template)
PR c++/28269 * parser.c (cp_parser_elaborated_type_specifier): Return early if an invalid type was detected. * g++.dg/template/crash54.C: New test. From-SVN: r115475
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/parser.c3
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/template/crash54.C5
4 files changed, 15 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c60d003..0dd1e8c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -7,6 +7,10 @@
type not being an acceptable Java parameter if
it's error_mark_node.
+ PR c++/28269
+ * parser.c (cp_parser_elaborated_type_specifier):
+ Return early if an invalid type was detected.
+
2006-07-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
PR c++/28249
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 81000bf..a2d41f1 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10247,6 +10247,9 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
}
}
+ if (type == error_mark_node)
+ return error_mark_node;
+
/* Allow attributes on forward declarations of classes. */
if (attributes)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 863b4ab..92606e2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,6 +2,9 @@
PR c++/28292
* g++.dg/other/error12.C: New test.
+
+ PR c++/28269
+ * g++.dg/template/crash54.C: New test.
2006-07-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
diff --git a/gcc/testsuite/g++.dg/template/crash54.C b/gcc/testsuite/g++.dg/template/crash54.C
new file mode 100644
index 0000000..26b4875
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash54.C
@@ -0,0 +1,5 @@
+//PR c++/28269
+
+template<int> struct A;
+
+struct __attribute__((unused)) A<0<; // { dg-error "template argument|unqualified-id" }