From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id 61DA53858C66 for ; Tue, 2 Jan 2024 22:52:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 61DA53858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 61DA53858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704235938; cv=none; b=KUyZeK2YSp4GSqtlFRlWgx/JlW04HZDWFGMObENm16FV7TUCyp0bXxe6/yoadCB165kfByXBoumudHSZ3rCsWzsZcJIkhCWDoM7wlNq6UOVzQzpXdzw/Bj9V3+wQYpc2SrjSn133Z2RUaucuvUyiFh0maK3vgjYpw45mqkvOMvA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704235938; c=relaxed/simple; bh=4u1b3rdeSr780Y9K+6Ho6n8AHd3Tj8U5PAvWu88he0A=; h=DKIM-Signature:Message-ID:Date:From:To:Subject:MIME-Version; b=l2jZggigBAm5+W7+/6hxtDGOWxIAKOapg+FCOxOC6jfz0YwNgEBSsdSZ6CdpRSHE73X7NPdQmcZ9Dsxps0gQZjDRDjolMhQQ6RJz6MWIwG0MtxTk+/0R8+jirwpbK6fgV6AkgF4+9AQQeLYMxVhSQnSQL72cwS0OVRse+WAE3pI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1d4ba539f6cso13684845ad.3 for ; Tue, 02 Jan 2024 14:52:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704235935; x=1704840735; darn=gcc.gnu.org; h=in-reply-to:content-disposition:mime-version:references:subject:cc :to:from:date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=WMz2ik3w5sGqstYf8JVfEuHU9JWQHYPlaT8YLhpRHQg=; b=hgVounMdRiT3LPF6oHjPPhudq0i6qOKkc9ZwfcdapjO9ImERqRe6UJGz19J1Bh33id sB4VRC7iz3CgfFfQ1zaI+y38fsPnTz6NFi0GUe25tUfJnibTRFjobVaJGCs266sT/lgS ZvT90xLFPNP5U1MgXpF7JeMhInep0rvXZSNf1qCjx5deFMyVV2V38hK5rz64E/i3z5jY CxCwrCtj0lunjwhTXkDZLp7REtRhYvAUgzUY3n/VxpvJBQJLgAWXB8v15Uk5NTAL1ibQ zy0GCFgTOXAELG1tv3RrEO/meGdrv1hgN7i0cUglLliZSnUApTxkpIfPETwmHa2/exA1 aAQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704235935; x=1704840735; h=in-reply-to:content-disposition:mime-version:references:subject:cc :to:from:date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WMz2ik3w5sGqstYf8JVfEuHU9JWQHYPlaT8YLhpRHQg=; b=cdUrWZixkZIFvIkCQluC0uRopGYeVkhHLrXWNOWlujrI+UL1SXCDW+7HJQaGwp8dWm i+0QS6VYenb2vxoHCTVUOziTXej9OqLPv67rBbjSry5z+uorMOqMP10fLAxjHK+1+74T 9fHC2U9eQ7/AC4zwMQhQcT3XlX/KS0xmW7IQY8cV5ou44ozmLRY+tQqqlhPFldDcfKOf LRHYfF3IV44KnaACW5eC8R7r2rwUAtkjB1i4LLQwjjGyXyKxz/51uUZv00RM9g/49COW xnzNrXjRcchwVBYkcChRewtk/J18upw9iN8wvBBno4MeluCMmdY7NM7IJt4TnY4q9ccN lCyQ== X-Gm-Message-State: AOJu0YwdQr1lOif2Cuqvj3zE71QdXsXYZwmuvVfDJ+8eWcapQ3nqleVD bzTVE4GlCSY7/mKV0T0niQeB3W19Jr8= X-Google-Smtp-Source: AGHT+IER/M1MpWkXR5H3Dlh3l+6Dwfc4BtfZ2XZKEzr9vipjxhaw3G9v3CTGi+5lGeCcHFLgiIUgag== X-Received: by 2002:a17:902:b108:b0:1d4:ab0f:c5d7 with SMTP id q8-20020a170902b10800b001d4ab0fc5d7mr5933870plr.3.1704235934909; Tue, 02 Jan 2024 14:52:14 -0800 (PST) Received: from Thaum. ([203.166.236.30]) by smtp.gmail.com with ESMTPSA id cc13-20020a17090af10d00b0028b8499dc80sm125204pjb.39.2024.01.02.14.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 14:52:14 -0800 (PST) Message-ID: <6594939e.170a0220.c46c8.06fa@mx.google.com> X-Google-Original-Message-ID: Date: Wed, 3 Jan 2024 09:52:09 +1100 From: Nathaniel Shead To: gcc-patches@gcc.gnu.org Cc: Jason Merrill , Nathan Sidwell Subject: Re: [PATCH] c++/modules: Prevent treating suppressed debug info as extern template [PR112820] References: <656c78b2.170a0220.62689.59e8@mx.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <656c78b2.170a0220.62689.59e8@mx.google.com> X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,URIBL_BLACK 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: Ping for https://gcc.gnu.org/pipermail/gcc-patches/2023-December/639082.html. On Sun, Dec 03, 2023 at 11:46:36PM +1100, Nathaniel Shead wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? > > -- >8 -- > > The TYPE_DECL_SUPPRESS_DEBUG and DECL_EXTERNAL flags use the same > underlying bit. This is causing confusion when attempting to determine > the interface for a streamed-in class type, since the modules code > currently assumes that all DECL_EXTERNAL types are extern templates. > However, when -g is specified then TYPE_DECL_SUPPRESS_DEBUG (and hence > DECL_EXTERNAL) is marked on various other kinds of declarations, such as > vtables, which causes them to never be emitted. > > This patch constrains the checks for DECL_EXTERNAL for this to only > consider template instantiations, thus avoiding the issue. > > PR c++/102607 > PR c++/112820 > > gcc/cp/ChangeLog: > > * module.cc (trees_in::read_class_def): Only set interface for > template instantiations. > > gcc/testsuite/ChangeLog: > > * g++.dg/modules/debug-2_a.C: New test. > * g++.dg/modules/debug-2_b.C: New test. > * g++.dg/modules/debug-2_c.C: New test. > * g++.dg/modules/debug-3_a.C: New test. > * g++.dg/modules/debug-3_b.C: New test. > > Signed-off-by: Nathaniel Shead > --- > gcc/cp/module.cc | 4 +++- > gcc/testsuite/g++.dg/modules/debug-2_a.C | 9 +++++++++ > gcc/testsuite/g++.dg/modules/debug-2_b.C | 8 ++++++++ > gcc/testsuite/g++.dg/modules/debug-2_c.C | 9 +++++++++ > gcc/testsuite/g++.dg/modules/debug-3_a.C | 8 ++++++++ > gcc/testsuite/g++.dg/modules/debug-3_b.C | 9 +++++++++ > 6 files changed, 46 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/modules/debug-2_a.C > create mode 100644 gcc/testsuite/g++.dg/modules/debug-2_b.C > create mode 100644 gcc/testsuite/g++.dg/modules/debug-2_c.C > create mode 100644 gcc/testsuite/g++.dg/modules/debug-3_a.C > create mode 100644 gcc/testsuite/g++.dg/modules/debug-3_b.C > > diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc > index 33fcf396875..257f39421d0 100644 > --- a/gcc/cp/module.cc > +++ b/gcc/cp/module.cc > @@ -12041,7 +12041,9 @@ trees_in::read_class_def (tree defn, tree maybe_template) > bool installing = maybe_dup && !TYPE_SIZE (type); > if (installing) > { > - if (DECL_EXTERNAL (defn) && TYPE_LANG_SPECIFIC (type)) > + if (DECL_EXTERNAL (defn) > + && TYPE_LANG_SPECIFIC (type) > + && CLASSTYPE_TEMPLATE_INSTANTIATION (type)) > { > /* We don't deal with not-really-extern, because, for a > module you want the import to be the interface, and for a > diff --git a/gcc/testsuite/g++.dg/modules/debug-2_a.C b/gcc/testsuite/g++.dg/modules/debug-2_a.C > new file mode 100644 > index 00000000000..eed0905542b > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/debug-2_a.C > @@ -0,0 +1,9 @@ > +// PR c++/112820 > +// { dg-additional-options "-fmodules-ts -g" } > +// { dg-module-cmi io } > + > +export module io; > + > +export struct error { > + virtual const char* what() const noexcept; > +}; > diff --git a/gcc/testsuite/g++.dg/modules/debug-2_b.C b/gcc/testsuite/g++.dg/modules/debug-2_b.C > new file mode 100644 > index 00000000000..fc9afbc02e0 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/debug-2_b.C > @@ -0,0 +1,8 @@ > +// PR c++/112820 > +// { dg-additional-options "-fmodules-ts -g" } > + > +module io; > + > +const char* error::what() const noexcept { > + return "bla"; > +} > diff --git a/gcc/testsuite/g++.dg/modules/debug-2_c.C b/gcc/testsuite/g++.dg/modules/debug-2_c.C > new file mode 100644 > index 00000000000..37117f69dcd > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/debug-2_c.C > @@ -0,0 +1,9 @@ > +// PR c++/112820 > +// { dg-module-do link } > +// { dg-additional-options "-fmodules-ts -g" } > + > +import io; > + > +int main() { > + error{}; > +} > diff --git a/gcc/testsuite/g++.dg/modules/debug-3_a.C b/gcc/testsuite/g++.dg/modules/debug-3_a.C > new file mode 100644 > index 00000000000..9e33d8260fd > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/debug-3_a.C > @@ -0,0 +1,8 @@ > +// PR c++/102607 > +// { dg-additional-options "-fmodules-ts -g" } > +// { dg-module-cmi mod } > + > +export module mod; > +export struct B { > + virtual ~B() = default; > +}; > diff --git a/gcc/testsuite/g++.dg/modules/debug-3_b.C b/gcc/testsuite/g++.dg/modules/debug-3_b.C > new file mode 100644 > index 00000000000..03c78b71b5d > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/debug-3_b.C > @@ -0,0 +1,9 @@ > +// PR c++/102607 > +// { dg-module-do link } > +// { dg-additional-options "-fmodules-ts -g" } > + > +import mod; > +int main() { > + struct D : B {}; > + (void)D{}; > +} > -- > 2.42.0 >