diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9661c8f6bc5003ce2364fd6c4fccde172df119e9..a41714cdcd1a860570e02193f6244233664dd701 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-25 Lee Millward <lee.millward@codesourcery.com>
+
+ PR c++/27329
+ PR c++/26938
+ * cp-tree.h (redeclare_class_template): Adjust declaration
+ to return bool instead of void.
+ * pt.c (redeclare_class_template): Update definition.
+ Return false on error.
+ * decl.c (xref_tag): Return error_mark_node if
+ redeclare_class_template returned false.
+
2006-09-21 Mark Mitchell <mark@codesourcery.com>
PR c++/29016
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 8f88976e78703352e506f49ee1d2eb2878df755a..227fc9dfdec0f1cb8e045b415c22e94bd3a60f5e 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4097,7 +4097,7 @@ extern tree end_template_parm_list (tree);
extern void end_template_decl (void);
extern tree push_template_decl (tree);
extern tree push_template_decl_real (tree, bool);
-extern void redeclare_class_template (tree, tree);
+extern bool redeclare_class_template (tree, tree);
extern tree lookup_template_class (tree, tree, tree, tree,
int, tsubst_flags_t);
extern tree lookup_template_function (tree, tree);
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7b932c05b1ec7d062899387bc2aac5d6f595ea21..84f2aaa49b3e15dfcf1c45f873b33c3aba6a7dfd 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9712,7 +9712,10 @@ xref_tag (enum tag_types tag_code, tree name,
else
{
if (template_header_p && IS_AGGR_TYPE (t))
- redeclare_class_template (t, current_template_parms);
+ {
+ if (!redeclare_class_template (t, current_template_parms))
+ POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, error_mark_node);
+ }
else if (!processing_template_decl
&& CLASS_TYPE_P (t)
&& CLASSTYPE_IS_TEMPLATE (t))
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index aea943ed0c18f4b7643581f0702b81951d9beb6c..daee2522047c313742062b80d09ce2c154ec0364 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3315,7 +3315,7 @@ push_template_decl (tree decl)
template <class T> struct S;
template <class T> struct S {}; */
-void
+bool
redeclare_class_template (tree type, tree parms)
{
tree tmpl;
@@ -3325,7 +3325,7 @@ redeclare_class_template (tree type, tree parms)
if (!TYPE_TEMPLATE_INFO (type))
{
error ("%qT is not a template type", type);
- return;
+ return false;
}
tmpl = TYPE_TI_TEMPLATE (type);
@@ -3333,13 +3333,13 @@ redeclare_class_template (tree type, tree parms)
/* The type is nested in some template class. Nothing to worry
about here; there are no new template parameters for the nested
type. */
- return;
+ return true;
if (!parms)
{
error ("template specifiers not specified in declaration of %qD",
tmpl);
- return;
+ return false;
}
parms = INNERMOST_TEMPLATE_PARMS (parms);
@@ -3351,7 +3351,7 @@ redeclare_class_template (tree type, tree parms)
error ("used %d template parameter(s) instead of %d",
TREE_VEC_LENGTH (tmpl_parms),
TREE_VEC_LENGTH (parms));
- return;
+ return false;
}
for (i = 0; i < TREE_VEC_LENGTH (tmpl_parms); ++i)
@@ -3379,7 +3379,7 @@ redeclare_class_template (tree type, tree parms)
{
error ("template parameter %q+#D", tmpl_parm);
error ("redeclared here as %q#D", parm);
- return;
+ return false;
}
if (tmpl_default != NULL_TREE && parm_default != NULL_TREE)
@@ -3390,7 +3390,7 @@ redeclare_class_template (tree type, tree parms)
by two different declarations in the same scope. */
error ("redefinition of default argument for %q#D", parm);
error ("%J original definition appeared here", tmpl_parm);
- return;
+ return false;
}
if (parm_default != NULL_TREE)
@@ -3402,6 +3402,8 @@ redeclare_class_template (tree type, tree parms)
parameters for any members. */
TREE_PURPOSE (TREE_VEC_ELT (parms, i)) = tmpl_default;
}
+
+ return true;
}
/* Simplify EXPR if it is a non-dependent expression. Returns the
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a99e5a8b3004118d3a6fbd2d1c3e523a16283c9..a511e56253652a719f3638a443c88ec00fba719a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-25 Lee Millward <lee.millward@codesourcery.com>
+
+ PR c++/26938
+ * g++.dg/template/crash58.C: New test.
+ * g++.dg/parse/crash28.C: Adjust error markers.
+ * g++.dg/template/crash34.C: Likewise.
+ * g++.dg/template/friend31.C: Likewise.
+ * g++.dg/template/crash32.C: Likewise.
+
+ PR c++/27329
+ * g++.dg/template/crash59.C: New test.
+
2006-09-24 Zdenek Dvorak <dvorakz@suse.cz>
Adam Nemet <anemet@caviumnetworks.com>
diff --git a/gcc/testsuite/g++.dg/parse/crash28.C b/gcc/testsuite/g++.dg/parse/crash28.C
index bc491655768541770335ecb985a8d660a0da4ad0..67d78d6bb7f5c3d5dff8cbfd6294c5ce83d6739c 100644
--- a/gcc/testsuite/g++.dg/parse/crash28.C
+++ b/gcc/testsuite/g++.dg/parse/crash28.C
@@ -7,7 +7,7 @@
template <class _Tp> class insert_iterator<slist<_Tp> > {}; // { dg-error "not a template|not declared in this scope|expected unqualified-id|extra" }
template <class _Value> class insert_iterator<int > { // { dg-error "template" }
- hash_set<_Value>; // { dg-error "no type|expected" }
+ hash_set<_Value>;
};
template<int> struct A<X<> > {}; // { dg-error "not a template|not declared in this scope|expected unqualified-id|extra" }
diff --git a/gcc/testsuite/g++.dg/template/crash32.C b/gcc/testsuite/g++.dg/template/crash32.C
index a8363512e9478a8e04e89170e117413b566066c3..4c7af8a39142fa4c33ce8760bbccc0644ba5b549 100644
--- a/gcc/testsuite/g++.dg/template/crash32.C
+++ b/gcc/testsuite/g++.dg/template/crash32.C
@@ -3,7 +3,7 @@
struct integral_constant { };
template<typename _Tp>
-struct is_function : public integral_constant { }; // { dg-error "previous" }
+struct is_function : public integral_constant { };
template<>
struct is_function : public integral_constant { }; // { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/template/crash34.C b/gcc/testsuite/g++.dg/template/crash34.C
index 9cca62f05391dcf494f7f9b9535d522f6c828585..ef4d21b60d84749967456d85763b05394c3efd15 100644
--- a/gcc/testsuite/g++.dg/template/crash34.C
+++ b/gcc/testsuite/g++.dg/template/crash34.C
@@ -9,4 +9,4 @@ class Foo;
template <typename T> class Foo { }; // { dg-error "not a template type" }
-Foo<int> x; // { dg-error "not a template" }
+Foo<int> x; // { dg-error "not a template|incomplete type" }
diff --git a/gcc/testsuite/g++.dg/template/crash58.C b/gcc/testsuite/g++.dg/template/crash58.C
new file mode 100644
index 0000000000000000000000000000000000000000..af2172c67326a71bcd1825c6cae1ce2d1927a399
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash58.C
@@ -0,0 +1,10 @@
+//PR 26938
+
+template<int, int = 0> struct A; // { dg-error "previous declaration" }
+
+template<int> struct A // { dg-error "template" }
+{
+ A();
+};
+
+A<0> a; // { dg-error "incomplete type" }
diff --git a/gcc/testsuite/g++.dg/template/crash59.C b/gcc/testsuite/g++.dg/template/crash59.C
new file mode 100644
index 0000000000000000000000000000000000000000..61d2188fc9ef02f352f547ebaa25d67f8d3adf16
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash59.C
@@ -0,0 +1,19 @@
+//PR c++/27329
+
+template<int> struct A // { dg-error "forward declaration" }
+! // { dg-error "expected unqualified-id" }
+ ;
+
+template<int> struct A { int foo(); }; // { dg-error "not a template" }
+
+int i = A<0>().foo(); // { dg-error "not a template|invalid use" }
+
+
+template<int> struct B
+! // { dg-error "expected unqualified-id" }
+ ;
+
+template<int> struct B { static int bar(); }; // { dg-error "not a template" }
+
+int j = B<0>::bar(); // { dg-error "not a template|incomplete type" }
+
diff --git a/gcc/testsuite/g++.dg/template/friend31.C b/gcc/testsuite/g++.dg/template/friend31.C
index 2d62f878a21a0cd0f8df7242770e1583521a53df..222ce238d78652f1fe996b8fd1aa3b93df66c17f 100644
--- a/gcc/testsuite/g++.dg/template/friend31.C
+++ b/gcc/testsuite/g++.dg/template/friend31.C
@@ -10,12 +10,12 @@ template <typename T, typename U> struct F; // { dg-error "previous declaration"
class W
{
template<int i> friend class F; // { dg-error "template parameter" }
- int x;
+ int x; // { dg-error "private" }
};
template <typename T, typename U> struct F
{
- void Look(W& w) { w.x = 3; }
+ void Look(W& w) { w.x = 3; } // { dg-error "within this context" }
};
int main()