* pt.c (instantiate_decl): Clear TI_PENDING_TEMPLATE_FLAG.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2e33286..b3c5092 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-01  Jason Merrill  <jason@casey.cygnus.com>
+
+       * pt.c (instantiate_decl): Clear TI_PENDING_TEMPLATE_FLAG.
+
 2000-03-02  Tom Tromey  <tromey@cygnus.com>
 
        * cp-tree.h (build_java_class_ref): Declare.
@@ -770,7 +774,7 @@ Mon Jan 31 15:35:29 2000  Jim Wilson  <wilson@cygnus.com>
 
 Thu Jan 27 20:53:36 2000  Jim Wilson  <wilson@cygnus.com>
 
-       * cp/optimize.c (remap_decl): Add walk_tree calls for DECL_SIZE (t)
+       * optimize.c (remap_decl): Add walk_tree calls for DECL_SIZE (t)
        and TYPE_MAX_VALUE (TYPE_DOMAIN (TREE_TYPE (t))).
 
 Thu Jan 27 13:54:12 2000  Mike Stump  <mrs@wrs.com>
@@ -784,7 +788,7 @@ Thu Jan 27 13:54:12 2000  Mike Stump  <mrs@wrs.com>
 
 Wed Jan 26 22:19:14 2000  J"orn Rennecke <amylaar@cygnus.co.uk>
 
-       * cp/optimize.c (calls_setjmp_r): Supply new argument
+       * optimize.c (calls_setjmp_r): Supply new argument
        to special_function_p.
 
 2000-01-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 64b48c4..d5e52e8 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9568,6 +9568,9 @@ instantiate_decl (d)
      try to instantiate it again.  */
   DECL_TEMPLATE_INSTANTIATED (d) = 1;
 
+  /* And we're not deferring instantiation any more.  */
+  TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (d)) = 0;
+
   /* Regenerate the declaration in case the template has been modified
      by a subsequent redeclaration.  */
   regenerate_decl_from_template (d, td);