diff options
| author | Jason Merrill <jason@redhat.com> | 2020-11-06 15:51:10 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-11-09 15:16:39 -0500 |
| commit | 83f1c165d2a2ebfba1164c730c0a65210fc4b285 (patch) | |
| tree | 30aa2b459267ba37cd3c584db8b9beee7da1c19e /gcc | |
| parent | 05b03452db6a520091aed254d3c399caed714b15 (diff) | |
| download | gcc-83f1c165d2a2ebfba1164c730c0a65210fc4b285.zip gcc-83f1c165d2a2ebfba1164c730c0a65210fc4b285.tar.gz gcc-83f1c165d2a2ebfba1164c730c0a65210fc4b285.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/pt.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2a885a9..88644b9 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: |