From 31b29c620e4a7fe59b61d81ed9c13e89fe293b33 Mon Sep 17 00:00:00 2001
From: Lee Millward <lee.millward@gmail.com>
Date: Sat, 15 Jul 2006 15:00:28 +0000
Subject: [PATCH] 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
---
gcc/cp/ChangeLog | 4 ++++
gcc/cp/parser.c | 3 +++
gcc/testsuite/ChangeLog | 3 +++
gcc/testsuite/g++.dg/template/crash54.C | 5 +++++
4 files changed, 15 insertions(+)
create mode 100644 gcc/testsuite/g++.dg/template/crash54.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c60d003a8408..0dd1e8ca4c26 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 81000bf47acb..a2d41f164a79 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 863b4ab78545..92606e25ba2c 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 000000000000..26b487571f4c
--- /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" }
--
GitLab