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.133.124]) by sourceware.org (Postfix) with ESMTPS id D81BE3858D20 for ; Fri, 29 Mar 2024 12:33:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D81BE3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D81BE3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711715617; cv=none; b=BH2jY1s8n+wpbnVdYqkXAYcaPRGXqvEL1hGIvCrMvz76OFtFX1MRWq1i4LV0bU70XP4BqyYe6bbJofaayhNAxkIA1d0st8DbtQAulxhDK5Wv3xnvUW2dxOmvb6hc2kQeYpjHZglo/Kj3MEfA+c7OYzM+BCfjia5zm/sayRPmga0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711715617; c=relaxed/simple; bh=jOEAjKQXem5CQHeR/2I4b8+H65yudg9wNSkjRDQb6S0=; h=DKIM-Signature:From:Date:To:Subject:Message-ID:MIME-Version; b=abYukzrTImYYTGUKRQY4waZTtJjNOFQXGEUMq2+4yd7xD6/7eryjFtEc5/h2l5d8bknd6ksna7qrdzfP3Th1Z/j5KKvsBtuLTWbNdiFLupc61rBX3cBxnM/M1u5v195QqScIF5PgJ5/c/l5/Nc3YWkQmxLj6ixUJkmu+IvbR5Zk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711715606; 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: in-reply-to:in-reply-to:references:references; bh=AQURqCD/Aal5Jn+OBgiu2Wyb4WSEnKOD4nyfhJ4G/Sk=; b=CdFbL/z99t+LqUWeiEi5fSG1tR0j7ak141JBmtwI2nGuLo7+HbGRJFILwZiRnW1575DTvz WKU/kgVOKZ8KnngPM+1Dr5xz9PNv/Qs0hbW7y8CBTQjgkMUPv77azUa009b0eXU7xEQ6+o Uf9yiLmdVbY2xWL3lm6su+P/QLsXTwk= Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-ruKFyT6LNmqcb7lXeVr1vA-1; Fri, 29 Mar 2024 08:33:24 -0400 X-MC-Unique: ruKFyT6LNmqcb7lXeVr1vA-1 Received: by mail-ot1-f71.google.com with SMTP id 46e09a7af769-6e6e3eae1c6so1925044a34.0 for ; Fri, 29 Mar 2024 05:33:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711715604; x=1712320404; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AQURqCD/Aal5Jn+OBgiu2Wyb4WSEnKOD4nyfhJ4G/Sk=; b=MNwVt5YbRBf1M0NJIYSy3nyd/FwXGRcHA45RJvJ5cXBLM3EluNNe/QAPK483jUWXHt kdJEwMWVfT2CM8RIg7U5QVE/jFMcU1e8NIPxyAhP1vRrEB5f9cMvHc9Dlu3kb1USX3iR 5kLHrXCc+yoBo3+eubYYQMH+45or0Y6PONLnqqi5iA8xagpJTqUV87RDP9nqxJvODC8Q 1eRxQIRCv6kX0sfPy1XZpTuLa9ZXJlxh2o0GaapZgMEWJTKK8RVc1kbcjt3J2aRyx06O +XlJxyRxv+6/3bBoT+DLI/37XpdCwU/kNmL165M/mAiIP1bAuTgVb7Q9o2ho3R+i1GyJ EukQ== X-Gm-Message-State: AOJu0YwtELpIZKRB/egzFVMrUS9Ze8uNzT2IDg2VPtv5q/Fesfz6Zj9l 9Ilmo6/sq7mb0zgi++BY8ybyCdRR+wn59gcBtsCbxUOM+W+5v66eJK2orl2JwGdVNPtVz1VpGZ+ zM0I+Q6T7UuXPEMK39+GRPFDyIfoXPPnNAtLPHB0hQBfh1oNIStUm3Is= X-Received: by 2002:a9d:6c11:0:b0:6e6:ecf2:2d9d with SMTP id f17-20020a9d6c11000000b006e6ecf22d9dmr2120824otq.10.1711715604172; Fri, 29 Mar 2024 05:33:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7I81yRSzZfDz1A5DWB9Vu71wNxX512uveQngLpPUqsdQCF4dFAcYQaJgh8MUCC8jVow5lgQ== X-Received: by 2002:a9d:6c11:0:b0:6e6:ecf2:2d9d with SMTP id f17-20020a9d6c11000000b006e6ecf22d9dmr2120810otq.10.1711715603946; Fri, 29 Mar 2024 05:33:23 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id pi32-20020a05620a37a000b0078a45c52dcasm1333887qkn.88.2024.03.29.05.33.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 05:33:23 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Fri, 29 Mar 2024 08:33:22 -0400 (EDT) To: Nathaniel Shead cc: gcc-patches@gcc.gnu.org, Jason Merrill , Nathan Sidwell Subject: Re: [PATCH] c++: Keep DECL_SAVED_TREE of destructor instantiations in modules [PR104040] In-Reply-To: <660633b1.170a0220.717f3.817f@mx.google.com> Message-ID: <3050e30a-db15-dd07-f933-79e8d6cf2115@idea> References: <660633b1.170a0220.717f3.817f@mx.google.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.0 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_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,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: On Fri, 29 Mar 2024, Nathaniel Shead wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? LGTM > > -- >8 -- > > A template instantiation still needs to have its DECL_SAVED_TREE so that > its definition is emitted into the CMI. This way it can be emitted in > the object file of any importers that use it, in case it doesn't end up > getting emitted in this TU. > > PR c++/104040 > > gcc/cp/ChangeLog: > > * semantics.cc (expand_or_defer_fn_1): Also keep DECL_SAVED_TREE > for template instantiations. > > gcc/testsuite/ChangeLog: > > * g++.dg/modules/pr104040_a.C: New test. > * g++.dg/modules/pr104040_b.C: New test. > > Signed-off-by: Nathaniel Shead > --- > gcc/cp/semantics.cc | 7 +++++-- > gcc/testsuite/g++.dg/modules/pr104040_a.C | 14 ++++++++++++++ > gcc/testsuite/g++.dg/modules/pr104040_b.C | 8 ++++++++ > 3 files changed, 27 insertions(+), 2 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/modules/pr104040_a.C > create mode 100644 gcc/testsuite/g++.dg/modules/pr104040_b.C > > diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc > index adb1ba48d29..84e9901509a 100644 > --- a/gcc/cp/semantics.cc > +++ b/gcc/cp/semantics.cc > @@ -5033,9 +5033,12 @@ expand_or_defer_fn_1 (tree fn) > /* We don't want to process FN again, so pretend we've written > it out, even though we haven't. */ > TREE_ASM_WRITTEN (fn) = 1; > - /* If this is a constexpr function, keep DECL_SAVED_TREE. */ > + /* If this is a constexpr function, or the body might need to be > + exported from a module CMI, keep DECL_SAVED_TREE. */ > if (!DECL_DECLARED_CONSTEXPR_P (fn) > - && !(modules_p () && DECL_DECLARED_INLINE_P (fn))) > + && !(modules_p () > + && (DECL_DECLARED_INLINE_P (fn) > + || DECL_TEMPLATE_INSTANTIATION (fn)))) > DECL_SAVED_TREE (fn) = NULL_TREE; > return false; > } > diff --git a/gcc/testsuite/g++.dg/modules/pr104040_a.C b/gcc/testsuite/g++.dg/modules/pr104040_a.C > new file mode 100644 > index 00000000000..ea36ce0a798 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/pr104040_a.C > @@ -0,0 +1,14 @@ > +// PR c++/104040 > +// { dg-additional-options "-fmodules-ts" } > +// { dg-module-cmi test } > + > +export module test; > + > +export template > +struct test { > + ~test() {} > +}; > + > +test use() { > + return {}; > +} > diff --git a/gcc/testsuite/g++.dg/modules/pr104040_b.C b/gcc/testsuite/g++.dg/modules/pr104040_b.C > new file mode 100644 > index 00000000000..efe014673fb > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/pr104040_b.C > @@ -0,0 +1,8 @@ > +// PR c++/104040 > +// { dg-additional-options "-fmodules-ts" } > + > +import test; > + > +int main() { > + test t{}; > +} > -- > 2.43.2 > >