c++: Call tsubst_pack_expansion from tsubst.

This was unnecessary (and incomplete) code duplication.

gcc/cp/ChangeLog:

	* pt.c (tsubst): Replace *_ARGUMENT_PACK code with
	a call to tsubst_argument_pack.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2a885a90857bf8c8ac66fef326cb61a653c43241..88644b9556b7bcddbe039ab95c31310909eb4dde 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16060,20 +16060,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 
     case TYPE_ARGUMENT_PACK:
     case NONTYPE_ARGUMENT_PACK:
-      {
-        tree r;
-
-       if (code == NONTYPE_ARGUMENT_PACK)
-         r = make_node (code);
-       else
-         r = cxx_make_type (code);
-
-       tree pack_args = ARGUMENT_PACK_ARGS (t);
-       pack_args = tsubst_template_args (pack_args, args, complain, in_decl);
-       SET_ARGUMENT_PACK_ARGS (r, pack_args);
-
-       return r;
-      }
+      return tsubst_argument_pack (t, args, complain, in_decl);
 
     case VOID_CST:
     case INTEGER_CST: