From patchwork Tue Oct 18 14:13:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 4191 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1982804wrs; Tue, 18 Oct 2022 07:14:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5790KfIRKZZJNA2GqYaA4HUQS0y0v7ophcM0+63JxO05DeIA4eHnmvFVdOuDOmplshkCxY X-Received: by 2002:aa7:d348:0:b0:45b:8ae3:ee3d with SMTP id m8-20020aa7d348000000b0045b8ae3ee3dmr2813853edr.428.1666102448970; Tue, 18 Oct 2022 07:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666102448; cv=none; d=google.com; s=arc-20160816; b=q2x7nkqcHqL1z1H6XS3A/aeM/86s92gX9J1SxJz16ceUqDweFDqGrFuAU8yKyFHVwI CA/CMlSXk+lPDEHd7QdeMu56gKolawA0YimcQq8SoXLnQORMnnr1pkeZ5jihQrMAD0kQ usfsFKvi6wOizTb2rihcTz1oqQmvJ+MnTii37yUIO+0nLZ+3PDbNAHY6WvlZW+L3W8eg nzbcLqxsqIhhpwMWdmdzrbWhPitf8k36nq0ttGiVTLvAVzieOZ5i6IurdQnf4ICTdgGH MSL69JM+KScyH1KWSB4Q2Veinlr1so7lxuAR7pnsIYjTuIMkqLrEyrnuh7nszpnpdlNF F0VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=QpSG0+82pNNJdI69Nlt6sGdsgHM1vjo1SrDmLtC1f40=; b=oxwvF2heS3Hw8I8cx8D8CsVV6pP0/HUpsmTFIVlZrKyWmb69Gb0n6UOGU0RhVRzri4 3KA5Sse7kpn+ZzUSnmsWxdvbsr5nPTJ6Qp+fAPjLd98bqTYrw4F+2x84cBMRLNZmVNuz sIzEsIMZ1rgAtnG/+5V3YszZxy/SeHoxuHyqgH5l3O+wrSrILZfOqwDIgmS4B1NW2FUF SvQfydLX/GBtDxPKteVdvydRrtDbuWGCnj3zvJMESpPbOEs+5t1xJpXbCJuh6kx45kY8 sy/y9C4IqxfyzilsJF4cXVUNenLukRhL9MGTG3mHs3y4c0D5mhyokIwRAy4+dXZhhUil j3eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=c5+eKqTW; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ho19-20020a1709070e9300b0078dcd448f97si13748070ejc.801.2022.10.18.07.14.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 07:14:08 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=c5+eKqTW; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BA4603857C41 for ; Tue, 18 Oct 2022 14:14:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA4603857C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666102447; bh=QpSG0+82pNNJdI69Nlt6sGdsgHM1vjo1SrDmLtC1f40=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=c5+eKqTWytxc8n9caaEWy3U5mN4je+GOYjXMKIH5xCGvVi/wJqCz9k5+Mj2G3Zua+ queqfszR2wf//1qhCmnmzo7yK57ipbJ4N5mVBymJ5BCtT/BqGwNmWKM/GkAMDiogzD CbKy1ONr9bcRL+XTdGvQhRC/8sqpAxJkN4ODBF70= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 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-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) To: gcc-patches@gcc.gnu.org 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 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: nathan@acm.org Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747035041413717168?= X-GMAIL-MSGID: =?utf-8?q?1747035041413717168?= 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); }