pt.c (tsubst_decl, [...]): Back out the last change.

2002-10-04  H.J. Lu  (hjl@gnu.org)

	* pt.c (tsubst_decl, case VAR_DECL): Back out the last change.
	(tsubst_expr, case DECL_STMT): Likewise.

From-SVN: r57825

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7e64f9406b7406665f3921e550416d1d6dcc11d3..8e72f118befde861fc51da79b79a1a20f42ddeba 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-04  H.J. Lu  (hjl@gnu.org)
+
+       * pt.c (tsubst_decl, case VAR_DECL): Back out the last change.
+       (tsubst_expr, case DECL_STMT): Likewise.
+
 2002-10-02  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/7754

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4c57a1db3a50f3e69005329ddd9e90882b1725fd..69789d5d33d9a4bbc1eff27134d0e8b605bba090 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6079,7 +6079,7 @@ tsubst_decl (t, args, type, complain)
          }
 
        r = copy_decl (t);
-       TREE_TYPE (r) = complete_type (type);
+       TREE_TYPE (r) = type;
        c_apply_type_quals_to_decl (cp_type_quals (type), r);
        DECL_CONTEXT (r) = ctx;
        /* Clear out the mangled name and RTL for the instantiation.  */
@@ -6115,8 +6115,6 @@ tsubst_decl (t, args, type, complain)
        TREE_CHAIN (r) = NULL_TREE;
        if (TREE_CODE (r) == VAR_DECL && VOID_TYPE_P (type))
          cp_error_at ("instantiation of `%D' as type `%T'", r, type);
-       /* Compute the size, alignment, etc. of R.  */
-       layout_decl (r, 0);
       }
       break;
 
@@ -7376,6 +7374,9 @@ tsubst_expr (t, args, complain, in_decl)
            decl = tsubst (decl, args, complain, in_decl);
            if (decl != error_mark_node)
              {
+                if (TREE_CODE (decl) != TYPE_DECL)
+                  /* Make sure the type is instantiated now. */
+                  complete_type (TREE_TYPE (decl));
                if (init)
                  DECL_INITIAL (decl) = error_mark_node;
                /* By marking the declaration as instantiated, we avoid
@@ -7385,26 +7386,19 @@ tsubst_expr (t, args, complain, in_decl)
                   do.  */
                if (TREE_CODE (decl) == VAR_DECL)
                  DECL_TEMPLATE_INSTANTIATED (decl) = 1;
-               if (TREE_CODE (decl) == VAR_DECL
-                   && ANON_AGGR_TYPE_P (TREE_TYPE (decl)))
-                 /* Anonymous aggregates are a special case.  */
-                 finish_anon_union (decl);
-               else 
+               maybe_push_decl (decl);
+               if (DECL_PRETTY_FUNCTION_P (decl))
                  {
-                   maybe_push_decl (decl);
-                   if (DECL_PRETTY_FUNCTION_P (decl))
-                     {
-                       /* For __PRETTY_FUNCTION__ we have to adjust the
-                          initializer.  */
-                       const char *const name
-                         = (*decl_printable_name) (current_function_decl, 2);
-                       init = cp_fname_init (name);
-                       TREE_TYPE (decl) = TREE_TYPE (init);
-                     }
-                   else
-                     init = tsubst_expr (init, args, complain, in_decl);
-                   cp_finish_decl (decl, init, NULL_TREE, 0);
+                   /* For __PRETTY_FUNCTION__ we have to adjust the
+                      initializer.  */
+                   const char *const name
+                     = (*decl_printable_name) (current_function_decl, 2);
+                   init = cp_fname_init (name);
+                   TREE_TYPE (decl) = TREE_TYPE (init);
                  }
+               else
+                 init = tsubst_expr (init, args, complain, in_decl);
+               cp_finish_decl (decl, init, NULL_TREE, 0);
              }
          }