From a30f62e037a3d682233878bd6ad710f2d14729e4 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Sun, 23 May 2004 22:48:37 +0000 Subject: [PATCH] re PR c++/15165 (ICE in instantiate_template) PR c++/15165 * pt.c (instantiate_template): Robustify. PR c++/15165 * g++.dg/template/crash19.C: New test. From-SVN: r82174 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 8 ++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/crash19.C | 17 +++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/crash19.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7fd46ac7108..a517716fc21 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2004-05-23 Mark Mitchell + + PR c++/15165 + * pt.c (instantiate_template): Robustify. + 2004-05-23 Mark Mitchell PR c++/15025 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2b124792572..38c91a0e188 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 32d2f1717e0..82101e4804c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-05-23 Mark Mitchell + + PR c++/15165 + * g++.dg/template/crash19.C: New test. + 2004-05-23 Mark Mitchell PR c++/15025 diff --git a/gcc/testsuite/g++.dg/template/crash19.C b/gcc/testsuite/g++.dg/template/crash19.C new file mode 100644 index 00000000000..a28827f31ac --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash19.C @@ -0,0 +1,17 @@ +// PR c++/15165 + +struct S +{ + template S(const T &e); +}; +int operator *(const double, const S &); +template +struct X { + enum { SIXTY_FOUR=64 }; + struct node { + unsigned char *ptr[sizeof(T)*SIXTY_FOUR]; + void d() {} + }; + node *head; +}; +template struct X; -- 2.30.2