From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 29A8D3858406 for ; Tue, 18 Oct 2022 14:13:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 29A8D3858406 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666102399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpSG0+82pNNJdI69Nlt6sGdsgHM1vjo1SrDmLtC1f40=; b=bsJOEyWIqzixK+BRamdY+johb+mGGtgGewECCTk3EvU80w9qtEXULSit38kOD7FLQWSxGq KpwHUadh5PQxi4wgvhcfv2mWMb2t4BB0+zrAiuVnV9NHD1wEhFNmp6ZGWFyl4NliJGbzDG 7OKRb5P5Jk6JRHk15NB+DZlG5yuGcPg= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-81-TuRm0GTXOP-5RrRL1ivycw-1; Tue, 18 Oct 2022 10:13:18 -0400 X-MC-Unique: TuRm0GTXOP-5RrRL1ivycw-1 Received: by mail-qv1-f72.google.com with SMTP id kr13-20020a0562142b8d00b004b1d5953a2cso8698397qvb.3 for ; Tue, 18 Oct 2022 07:13:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QpSG0+82pNNJdI69Nlt6sGdsgHM1vjo1SrDmLtC1f40=; b=DGgtA4eaVRBseYC8EIkqCmFfPNbhAoZC+VNFzkgXQQ5hWaJTihp/gchlYn+TakLwC6 LnaNl38KaadFfdZsc5Ag9AFA5PEi8ge+I0omTrBxANvyoxzHev0+ggNHDqCBVzE+6qVs rDr6ZIEODF6z1oljme+BF1RfMo+pDmLqS/Eb3zkMYDg3wyjOBfpPa3Hgl9lpa8gjbGDM xDc314wCdHAfxVu+3ntaid+5QRNsEQ3Snr65wd9IKzQVVZ6qEZ4D9obUQ35yfHbfxUoT Y96l0SSnVwF4hwqsrFqjNQ7PLyS5Zrk/cVd63BwKcwsmBaFu5NLq5zFo8CSgAJOY/UXj CEJw== X-Gm-Message-State: ACrzQf1PluYzVzc30l77vdc+3OEYuld4kVi6xYExmGgCKfz3NwE6SKji bgb4hRjNcgGwZsZtg1vGwzjwol4+Eg44Y/P6nbmTQMjeq9I4ZGsrR9n3YxSDRpoOAk554lvBMT3 dB1IVP4xI2y8nca8bbyZOxUt9zVTxA/5JJ8IL0YZT0R9+OTR4BPegZWCDo9wbWe862gI= X-Received: by 2002:ac8:5b0d:0:b0:39c:dc69:d200 with SMTP id m13-20020ac85b0d000000b0039cdc69d200mr2238239qtw.233.1666102397639; Tue, 18 Oct 2022 07:13:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4U4HW7lQ67sIm6aj5AKd1RaJ/x9Dju8BS/ZbsaPCRQrk4QalAW7iaMNCtnMdYICx+4Qe5BLg== X-Received: by 2002:ac8:5b0d:0:b0:39c:dc69:d200 with SMTP id m13-20020ac85b0d000000b0039cdc69d200mr2238216qtw.233.1666102397342; Tue, 18 Oct 2022 07:13:17 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id x30-20020a05620a0b5e00b006cfc9846594sm2383958qkg.93.2022.10.18.07.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 07:13:16 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, nathan@acm.org, Patrick Palka Subject: [PATCH] c++ modules: stream non-trailing default targs [PR105045] Date: Tue, 18 Oct 2022 10:13:10 -0400 Message-Id: <20221018141310.3139378-1-ppalka@redhat.com> X-Mailer: git-send-email 2.38.0.118.g4732897cf0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. Tested on x86_64-pc-linux-gnu, does this look OK for trunk? PR c++/105045 gcc/cp/ChangeLog: * module.cc (trees_out::tpl_parms_fini): Don't assume default template arguments are all 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. --- 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(-) create mode 100644 gcc/testsuite/g++.dg/modules/pr105045_a.C create mode 100644 gcc/testsuite/g++.dg/modules/pr105045_b.C 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); } -- 2.38.0.118.g4732897cf0