From patchwork Tue Oct 4 17:36:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1686057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=HSAutX24; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MhlKQ1JTmz1ypH for ; Wed, 5 Oct 2022 04:37:59 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1D803858C33 for ; Tue, 4 Oct 2022 17:37:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1D803858C33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664905075; bh=m2dtSM9M9Ksn2DM+sAjPus7BtYQMy26HaBuSlS/KYCU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=HSAutX24inkTyURJrC1QYW6ODGa9nlTIxwgl+R0mEvKRG8FisTlvwbI0xQUHYmw0o CPhGW/+nSxEPky1JrQ4fjZgFzegWZ8LRmrSGopYOQ/BE5QOovQWsDvMdiYv8OYl+Cc 9qj5QD1NoMBkq9cwHrCrssg3r0LkV5zE3jK5v8xg= 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 D28B23858D32 for ; Tue, 4 Oct 2022 17:36:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D28B23858D32 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-657-hoFwGyC2ORCfQO0e5H0noA-1; Tue, 04 Oct 2022 13:36:36 -0400 X-MC-Unique: hoFwGyC2ORCfQO0e5H0noA-1 Received: by mail-qk1-f197.google.com with SMTP id bs33-20020a05620a472100b006cef8cfabe2so12199013qkb.12 for ; Tue, 04 Oct 2022 10:36:36 -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=m2dtSM9M9Ksn2DM+sAjPus7BtYQMy26HaBuSlS/KYCU=; b=bOvH7uvea1CLDT+r3Jqt8V6ae9vh2HNs3k4taT+l5xI++SuEtDTjYl7KPCEpNV4qw9 gi/r24pbLgimW8iR+PkAco+qX4oM3mhtldqkmYRV3YBrZHlpMBXTxHFjZmPA8AW9zaIe 41/7nURXt+bxvoNFuNUMKwZR4Pcu/SGBIaan3+qNl0jBlB+A2Ur4Q6j0sgstMdgoWv0N Il+eahqW515Mt3TYlUFZ9KpkOGOPLCmZSJXR0pQ/KKUPrPG031d9gFoavFGUtDr9RMeo WBB+ASCCiyD7bEb7bPnCLLGiYz0JV9lMmYeEvq07MlbTm6G8myAIRri0en4CiTgVruep pEdA== X-Gm-Message-State: ACrzQf3O43lUr7ca0lLA+EqnXiRhT/Y3O7jfAPFtnUxMbJRvzK4NYe2Q I1i4hkqxbw3dx1nsxRUR5srypJZrbj36XUtqcsBRNQWRNvgLb89bX21qAnFNozctmY2TUHdkEhk Jomn65a0dJ6su515xr0yznHDEuCwcwWaesCPmhoVwyebEczVxEvRrn18pLOmr9GsQCRk= X-Received: by 2002:a05:6214:2342:b0:473:bcd6:a3b7 with SMTP id hu2-20020a056214234200b00473bcd6a3b7mr20920838qvb.88.1664904994160; Tue, 04 Oct 2022 10:36:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ZWuHcWBnkMDFHqxaqOc7qumXlaHBdI1Szkd5bnWid/qbQjer6DX9WvAHjJx6bRJQ+dk9zMg== X-Received: by 2002:a05:6214:2342:b0:473:bcd6:a3b7 with SMTP id hu2-20020a056214234200b00473bcd6a3b7mr20920808qvb.88.1664904993800; Tue, 04 Oct 2022 10:36:33 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id l18-20020a37f912000000b006ce580c2663sm14717419qkj.35.2022.10.04.10.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 10:36:33 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++ modules: lazy loading from within template [PR99377] Date: Tue, 4 Oct 2022 13:36:31 -0400 Message-Id: <20221004173631.2958133-1-ppalka@redhat.com> X-Mailer: git-send-email 2.38.0.rc2 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.3 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_LOW, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Here when lazily loading the binding for f at parse time from the template g, processing_template_decl is set and thus the call to note_vague_linkage_fn from module_state::read_cluster has no effect, and we never push f onto deferred_fns and end up never emitting its definition. ISTM the behavior of the lazy loading machinery shouldn't be sensitive to whether we're inside a template, and therefore we should probably be clearing processing_template_decl somewhere e.g in lazy_load_binding. This is sufficient to fix the testcase. But it also seems the processing_template_decl test in note_vague_linkage_fn, added by r8-7539-g977bc3ee11383e for PR84973, is perhaps too strong: if the intent is to avoid deferring output for uninstantiated templates, we should make sure that DECL in question is an uninstantiated template by checking e.g. value_dependent_expression_p. This too is sufficient to fix the testcase (since f isn't a template) and survives bootstrap and regtest. Does one or the other approach look like the correct fix for this PR? PR c++/99377 gcc/cp/ChangeLog: * decl2.cc (note_vague_linkage_fn): Relax processing_template_decl test to value_dependent_expression_p. * module.cc (lazy_load_binding): Clear processing_template_decl. gcc/testsuite/ChangeLog: * g++.dg/modules/pr99377-2_a.C: New test. * g++.dg/modules/pr99377-2_b.C: New test. --- gcc/cp/decl2.cc | 2 +- gcc/cp/module.cc | 2 ++ gcc/testsuite/g++.dg/modules/pr99377-2_a.C | 5 +++++ gcc/testsuite/g++.dg/modules/pr99377-2_b.C | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/modules/pr99377-2_a.C create mode 100644 gcc/testsuite/g++.dg/modules/pr99377-2_b.C diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc index 9f18466192f..5af4d17ee3b 100644 --- a/gcc/cp/decl2.cc +++ b/gcc/cp/decl2.cc @@ -876,7 +876,7 @@ check_classfn (tree ctype, tree function, tree template_parms) void note_vague_linkage_fn (tree decl) { - if (processing_template_decl) + if (value_dependent_expression_p (decl)) return; DECL_DEFER_OUTPUT (decl) = 1; diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 500ac06563a..79cbb346ffa 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -19074,6 +19074,8 @@ lazy_load_binding (unsigned mod, tree ns, tree id, binding_slot *mslot) timevar_start (TV_MODULE_IMPORT); + processing_template_decl_sentinel ptds; + /* Stop GC happening, even in outermost loads (because our caller could well be building up a lookup set). */ function_depth++; diff --git a/gcc/testsuite/g++.dg/modules/pr99377-2_a.C b/gcc/testsuite/g++.dg/modules/pr99377-2_a.C new file mode 100644 index 00000000000..26e2bccbbbe --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr99377-2_a.C @@ -0,0 +1,5 @@ +// PR c++/99377 +// { dg-additional-options -fmodules-ts } +// { dg-module-cmi pr99377 } +export module pr99377; +export inline void f() { } diff --git a/gcc/testsuite/g++.dg/modules/pr99377-2_b.C b/gcc/testsuite/g++.dg/modules/pr99377-2_b.C new file mode 100644 index 00000000000..69571952c8a --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr99377-2_b.C @@ -0,0 +1,6 @@ +// PR c++/99377 +// { dg-additional-options -fmodules-ts } +// { dg-do link } +import pr99377; +template void g() { f(); } +int main() { g(); }