diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/crash19.C | 17 |
4 files changed, 33 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7fd46ac..a517716 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2004-05-23 Mark Mitchell <mark@codesourcery.com> + PR c++/15165 + * pt.c (instantiate_template): Robustify. + +2004-05-23 Mark Mitchell <mark@codesourcery.com> + PR c++/15025 * decl.c (xref_tag): Issue errors about redeclaring template classes as non-template classes. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2b12479..38c91a0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -8661,10 +8661,14 @@ instantiate_template (tree tmpl, tree targ_ptr, tsubst_flags_t complain) /* If this function is a clone, handle it specially. */ if (DECL_CLONED_FUNCTION_P (tmpl)) { - tree spec = instantiate_template (DECL_CLONED_FUNCTION (tmpl), targ_ptr, - complain); + tree spec; tree clone; + spec = instantiate_template (DECL_CLONED_FUNCTION (tmpl), targ_ptr, + complain); + if (spec == error_mark_node) + return error_mark_node; + /* Look for the clone. */ for (clone = TREE_CHAIN (spec); clone && DECL_CLONED_FUNCTION_P (clone); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 32d2f17..82101e4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2004-05-23 Mark Mitchell <mark@codesourcery.com> + PR c++/15165 + * g++.dg/template/crash19.C: New test. + +2004-05-23 Mark Mitchell <mark@codesourcery.com> + PR c++/15025 * g++.dg/template/redecl1.C: New test. diff --git a/gcc/testsuite/g++.dg/template/crash19.C b/gcc/testsuite/g++.dg/template/crash19.C new file mode 100644 index 0000000..a28827f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash19.C @@ -0,0 +1,17 @@ +// PR c++/15165 + +struct S +{ + template <class T> S(const T &e); +}; +int operator *(const double, const S &); +template <class T> +struct X { + enum { SIXTY_FOUR=64 }; + struct node { + unsigned char *ptr[sizeof(T)*SIXTY_FOUR]; + void d() {} + }; + node *head; +}; +template struct X<int>; |