From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 083113858C83; Tue, 18 Oct 2022 14:58:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 083113858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666105105; bh=NTWc0sXVwiA8hbkYt9BX2d5ESm9pC0JjjjBUphvzlRw=; h=From:To:Subject:Date:From; b=KoCoAh2nlRXfXgQe+H78lo1dLmbRSUzOZooFAFdhMOv+HSubeBIbJBTGJNlmrYAro m3Qcek2wPf+EQwXZfru/jfA01ZcllYWkYe1w9uJsWqwZ9yYJ/Z9L1rJT07/xPTcNeC Pra7zTNsJa3q+/51TbLFxOU3d09pNCS2TKPJHrpg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3362] c++ modules: stream non-trailing default targs [PR105045] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: c70b44f2c1adf9a9b1c64105d07f177e86139fca X-Git-Newrev: 0101137c7c5d612c0624f9a2fd5198b302243f85 Message-Id: <20221018145825.083113858C83@sourceware.org> Date: Tue, 18 Oct 2022 14:58:25 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0101137c7c5d612c0624f9a2fd5198b302243f85 commit r13-3362-g0101137c7c5d612c0624f9a2fd5198b302243f85 Author: Patrick Palka Date: Tue Oct 18 10:57:30 2022 -0400 c++ modules: stream non-trailing default targs [PR105045] This fixes the below testcase in which we neglect to stream the default argument for T only because the subsequent parameter U doesn't also have a default argument. PR c++/105045 gcc/cp/ChangeLog: * module.cc (trees_out::tpl_parms_fini): Don't assume default template arguments must be trailing. (trees_in::tpl_parms_fini): Likewise. gcc/testsuite/ChangeLog: * g++.dg/modules/pr105045_a.C: New test. * g++.dg/modules/pr105045_b.C: New test. Diff: --- gcc/cp/module.cc | 20 ++++++-------------- gcc/testsuite/g++.dg/modules/pr105045_a.C | 7 +++++++ gcc/testsuite/g++.dg/modules/pr105045_b.C | 6 ++++++ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 999ff3faafc..2c2f9a9a8cb 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -10034,15 +10034,11 @@ trees_out::tpl_parms_fini (tree tmpl, unsigned tpl_levels) tree vec = TREE_VALUE (parms); tree_node (TREE_TYPE (vec)); - tree dflt = error_mark_node; for (unsigned ix = TREE_VEC_LENGTH (vec); ix--;) { tree parm = TREE_VEC_ELT (vec, ix); - if (dflt) - { - dflt = TREE_PURPOSE (parm); - tree_node (dflt); - } + tree dflt = TREE_PURPOSE (parm); + tree_node (dflt); if (streaming_p ()) { @@ -10072,19 +10068,15 @@ trees_in::tpl_parms_fini (tree tmpl, unsigned tpl_levels) tpl_levels--; parms = TREE_CHAIN (parms)) { tree vec = TREE_VALUE (parms); - tree dflt = error_mark_node; TREE_TYPE (vec) = tree_node (); for (unsigned ix = TREE_VEC_LENGTH (vec); ix--;) { tree parm = TREE_VEC_ELT (vec, ix); - if (dflt) - { - dflt = tree_node (); - if (get_overrun ()) - return false; - TREE_PURPOSE (parm) = dflt; - } + tree dflt = tree_node (); + if (get_overrun ()) + return false; + TREE_PURPOSE (parm) = dflt; tree decl = TREE_VALUE (parm); if (TREE_CODE (decl) == TEMPLATE_DECL) diff --git a/gcc/testsuite/g++.dg/modules/pr105045_a.C b/gcc/testsuite/g++.dg/modules/pr105045_a.C new file mode 100644 index 00000000000..597f9294185 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr105045_a.C @@ -0,0 +1,7 @@ +// PR c++/105045 +// { dg-additional-options -fmodules-ts } +// { dg-module-cmi pr105045 } + +export module pr105045; + +export template void f(U) { } diff --git a/gcc/testsuite/g++.dg/modules/pr105045_b.C b/gcc/testsuite/g++.dg/modules/pr105045_b.C new file mode 100644 index 00000000000..77c94d4c473 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr105045_b.C @@ -0,0 +1,6 @@ +// PR c++/105045 +// { dg-additional-options -fmodules-ts } + +import pr105045; + +int main() { f(0); }