From: Nathan Sidwell <nathan@acm.org>
To: Nathaniel Shead <nathanieloshead@gmail.com>, gcc-patches@gcc.gnu.org
Cc: Jason Merrill <jason@redhat.com>
Subject: Re: [PATCH] c++/modules: Allow exporting const-qualified namespace-scope variables [PR99232]
Date: Thu, 23 Nov 2023 12:13:50 -0500 [thread overview]
Message-ID: <7e01750a-70b0-4e75-b998-8ab896546bef@acm.org> (raw)
In-Reply-To: <6554b88d.a70a0220.35c73.8474@mx.google.com>
On 11/15/23 07:24, Nathaniel Shead wrote:
> Bootstrapped and regtested on x86_64-pc-linux-gnu. I don't have write
> access.
>
> -- >8 --
>
> By [basic.link] p3.2.1, a non-template non-volatile const-qualified
> variable is not necessarily internal linkage in a module declaration,
> and rather may have module linkage (or external linkage if it is
> exported, see p4.8).
ok, but can you augment the testcase to check the address is the same in both
TUs? (something like an accessor in the module and a runtime-check in the
importer?)
nathan
>
> PR c++/99232
>
> gcc/cp/ChangeLog:
>
> * decl.cc (grokvardecl): Don't mark variables attached to
> modules as internal.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/modules/pr99232_a.C: New test.
> * g++.dg/modules/pr99232_b.C: New test.
>
> Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
> ---
> gcc/cp/decl.cc | 3 ++-
> gcc/testsuite/g++.dg/modules/pr99232_a.C | 8 ++++++++
> gcc/testsuite/g++.dg/modules/pr99232_b.C | 7 +++++++
> 3 files changed, 17 insertions(+), 1 deletion(-)
> create mode 100644 gcc/testsuite/g++.dg/modules/pr99232_a.C
> create mode 100644 gcc/testsuite/g++.dg/modules/pr99232_b.C
>
> diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
> index d2ed46b1453..173dd93ef5b 100644
> --- a/gcc/cp/decl.cc
> +++ b/gcc/cp/decl.cc
> @@ -10992,7 +10992,8 @@ grokvardecl (tree type,
> && (DECL_THIS_EXTERN (decl)
> || ! constp
> || volatilep
> - || inlinep));
> + || inlinep
> + || module_attach_p ()));
> TREE_STATIC (decl) = ! DECL_EXTERNAL (decl);
> }
> /* Not at top level, only `static' makes a static definition. */
> diff --git a/gcc/testsuite/g++.dg/modules/pr99232_a.C b/gcc/testsuite/g++.dg/modules/pr99232_a.C
> new file mode 100644
> index 00000000000..33b3b783399
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/modules/pr99232_a.C
> @@ -0,0 +1,8 @@
> +// PR c++/99232
> +// { dg-additional-options "-fmodules-ts" }
> +// { dg-module-cmi pr99232 }
> +
> +export module pr99232;
> +
> +export const double lambda{ 1.3 };
> +export constexpr int a = 42;
> diff --git a/gcc/testsuite/g++.dg/modules/pr99232_b.C b/gcc/testsuite/g++.dg/modules/pr99232_b.C
> new file mode 100644
> index 00000000000..98f3c52a51c
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/modules/pr99232_b.C
> @@ -0,0 +1,7 @@
> +// PR c++/99232
> +// { dg-additional-options "-fmodules-ts" }
> +
> +import pr99232;
> +
> +double foo() { return lambda * 2.0; }
> +static_assert(a == 42);
--
Nathan Sidwell
prev parent reply other threads:[~2023-11-23 17:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 12:24 Nathaniel Shead
2023-11-23 17:13 ` Nathan Sidwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7e01750a-70b0-4e75-b998-8ab896546bef@acm.org \
--to=nathan@acm.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=nathanieloshead@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).