From 1f6f0cb610621cec5a80b54ba850fee18d4282ad Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Tue, 29 Apr 2003 22:15:34 +0000 Subject: [PATCH] re PR c++/10551 (Failure to emit explicitly instantiated template w/--no-implicit-templates) PR c++/10551 * pt.c (mark_decl_instantiated): Defer all explicit instantiations that have not yet been written out. PR c++/10551 * g++.dg/template/explicit1.C: New test. From-SVN: r66263 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/pt.c | 18 ++++++++++++------ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/explicit1.C | 17 +++++++++++++++++ 4 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/explicit1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3da06762f4b..f255e1390b1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-04-29 Mark Mitchell + + PR c++/10551 + * pt.c (mark_decl_instantiated): Defer all explicit instantiations + that have not yet been written out. + 2003-04-29 Mark Mitchell PR c++/10549 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 02d910d5f34..52df60b59cf 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9915,11 +9915,6 @@ mark_decl_instantiated (result, extern_p) tree result; int extern_p; { - if (TREE_CODE (result) != FUNCTION_DECL) - /* The TREE_PUBLIC flag for function declarations will have been - set correctly by tsubst. */ - TREE_PUBLIC (result) = 1; - /* We used to set this unconditionally; we moved that to do_decl_instantiation so it wouldn't get set on members of explicit class template instantiations. But we still need to set @@ -9928,6 +9923,16 @@ mark_decl_instantiated (result, extern_p) if (extern_p) SET_DECL_EXPLICIT_INSTANTIATION (result); + /* If this entity has already been written out, it's too late to + make any modifications. */ + if (TREE_ASM_WRITTEN (result)) + return; + + if (TREE_CODE (result) != FUNCTION_DECL) + /* The TREE_PUBLIC flag for function declarations will have been + set correctly by tsubst. */ + TREE_PUBLIC (result) = 1; + if (! extern_p) { DECL_INTERFACE_KNOWN (result) = 1; @@ -9941,7 +9946,8 @@ mark_decl_instantiated (result, extern_p) else if (TREE_PUBLIC (result)) maybe_make_one_only (result); } - else if (TREE_CODE (result) == FUNCTION_DECL) + + if (TREE_CODE (result) == FUNCTION_DECL) defer_fn (result); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9fba7a37219..4a0d42cbea2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-04-29 Mark Mitchell + + PR c++/10551 + * g++.dg/template/explicit1.C: New test. + 2003-04-29 Mark Mitchell PR c++/10549 diff --git a/gcc/testsuite/g++.dg/template/explicit1.C b/gcc/testsuite/g++.dg/template/explicit1.C new file mode 100644 index 00000000000..64f581e58df --- /dev/null +++ b/gcc/testsuite/g++.dg/template/explicit1.C @@ -0,0 +1,17 @@ +// { dg-do link } +// { dg-options "-fno-implicit-templates" } + +template struct C { + ~C(); +}; +template C::~C() {} + +struct X { + C *p; + ~X() { delete p; } +}; + +template class C; +C x; + +int main () {} -- 2.30.2