pt.c (coerce_template_parms): Make sure to digest_init if possible.

	* pt.c (coerce_template_parms): Make sure to digest_init if
	possible.

From-SVN: r17138

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 18e77ea58cbeb4da2bb200f5eed247a62a6a71bb..8899897a0f6287e10f0410c665c781b8db7720f1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 Thu Dec 18 14:51:50 1997  Mark Mitchell  <mmitchell@usa.net>
 
+       * pt.c (coerce_template_parms): Make sure to digest_init if
+       possible.
+
        * decl.c (duplicate_decls): Make the newdecl virtual if the
        olddecl was, just as is done with other attributes of olddecl.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index c1cfa9253f5ca22c092c8216f35c8e07b93b8d56..9476d1286f83c49a5fb7f324dbf64e76f3c6c256 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1079,7 +1079,10 @@ coerce_template_parms (parms, arglist, in_decl)
          if (processing_template_decl)
            val = maybe_fold_nontype_arg (arg);
          else
-           val = digest_init (t, arg, (tree *) 0);
+           val = arg;
+
+         if (!uses_template_parms (val) && !uses_template_parms (t))
+           val = digest_init (t, val, (tree *) 0);
 
          if (val == error_mark_node 
              || (processing_template_decl && uses_template_parms (val)))