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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66263 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 40 insertions, 6 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3da06762f4b..f255e1390b1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
 2003-04-29  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/10551
+	* pt.c (mark_decl_instantiated): Defer all explicit instantiations
+	that have not yet been written out.
+
+2003-04-29  Mark Mitchell  <mark@codesourcery.com>
+
 	PR c++/10549
 	* class.c (layout_class_type): Mark overlong bitfields as having
 	the maximum size permitted by their type, after layout.
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,5 +1,10 @@
 2003-04-29  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/10551
+	* g++.dg/template/explicit1.C: New test.
+
+2003-04-29  Mark Mitchell  <mark@codesourcery.com>
+
 	PR c++/10549
 	* g++.dg/other/bitfield1.C: New test.
 
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 <class T> struct C {
+  ~C();
+};
+template <class T> C<T>::~C() {}
+
+struct X {
+  C<X> *p;
+  ~X() { delete p; }
+};
+
+template class C<X>;
+C<X> x;
+
+int main () {}