From 83f1c165d2a2ebfba1164c730c0a65210fc4b285 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 6 Nov 2020 15:51:10 -0500 Subject: [PATCH] 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. --- gcc/cp/pt.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2a885a90857..88644b9556b 100644 --- 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: -- 2.30.2