aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/template/crash73.C9
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index efc48a9..00b18f8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/34100
+ * pt.c (apply_late_template_attributes): Do nothing if decl's type is
+ error_mark_node.
+
2007-11-13 Jakub Jelinek <jakub@redhat.com>
PR c++/34054
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 8a95ccf..5e1335f 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6622,7 +6622,11 @@ apply_late_template_attributes (tree *decl_p, tree attributes, int attr_flags,
}
if (DECL_P (*decl_p))
- p = &DECL_ATTRIBUTES (*decl_p);
+ {
+ if (TREE_TYPE (*decl_p) == error_mark_node)
+ return;
+ p = &DECL_ATTRIBUTES (*decl_p);
+ }
else
p = &TYPE_ATTRIBUTES (*decl_p);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5d00b2d..ec46967 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/34100
+ * g++.dg/template/crash73.C: New test.
+
2007-11-15 Jakub Jelinek <jakub@redhat.com>
PR middle-end/23848
diff --git a/gcc/testsuite/g++.dg/template/crash73.C b/gcc/testsuite/g++.dg/template/crash73.C
new file mode 100644
index 0000000..5c3c87d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash73.C
@@ -0,0 +1,9 @@
+// PR c++/34100
+// { dg-do compile }
+
+template<typename T> struct A
+{
+ typedef typename T::X Y __attribute__((vector_size(8))); // { dg-error "is not a class, struct" }
+};
+
+A<int> a;