* [PATCH] c++: Export usings referring to global module fragment [PR109679]
@ 2024-01-03 10:01 Nathaniel Shead
2024-01-06 22:25 ` Nathan Sidwell
0 siblings, 1 reply; 2+ messages in thread
From: Nathaniel Shead @ 2024-01-03 10:01 UTC (permalink / raw)
To: gcc-patches; +Cc: Jason Merrill, Nathan Sidwell
Bootstrapped & regtested on x86_64-pc-linux-gnu, OK for trunk?
-- >8 --
This patch stops 'add_binding_entity' from ignoring all names in the
global module fragment, since they should still be exported if named
in an exported using-declaration.
PR c++/109679
gcc/cp/ChangeLog:
* module.cc (depset::hash::add_binding_entity): Don't skip names
in the GMF if they've been exported with a using declaration.
gcc/testsuite/ChangeLog:
* g++.dg/modules/using-11.h: New test.
* g++.dg/modules/using-11_a.C: New test.
* g++.dg/modules/using-11_b.C: New test.
Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
---
gcc/cp/module.cc | 6 ++++--
gcc/testsuite/g++.dg/modules/using-11.h | 2 ++
gcc/testsuite/g++.dg/modules/using-11_a.C | 9 +++++++++
gcc/testsuite/g++.dg/modules/using-11_b.C | 8 ++++++++
4 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/modules/using-11.h
create mode 100644 gcc/testsuite/g++.dg/modules/using-11_a.C
create mode 100644 gcc/testsuite/g++.dg/modules/using-11_b.C
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index 82b61a2c2ad..865a4b77eca 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -12837,8 +12837,10 @@ depset::hash::add_binding_entity (tree decl, WMB_Flags flags, void *data_)
else if (TREE_CODE (inner) == TEMPLATE_DECL)
inner = DECL_TEMPLATE_RESULT (inner);
- if (!DECL_LANG_SPECIFIC (inner) || !DECL_MODULE_PURVIEW_P (inner))
- /* Ignore global module fragment entities. */
+ if ((!DECL_LANG_SPECIFIC (inner) || !DECL_MODULE_PURVIEW_P (inner))
+ && !(flags & (WMB_Using | WMB_Export)))
+ /* Ignore global module fragment entities unless explicitly
+ exported with a using declaration. */
return false;
if (VAR_OR_FUNCTION_DECL_P (inner)
diff --git a/gcc/testsuite/g++.dg/modules/using-11.h b/gcc/testsuite/g++.dg/modules/using-11.h
new file mode 100644
index 00000000000..64c1b0ca335
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/using-11.h
@@ -0,0 +1,2 @@
+// PR c++/109679
+inline int foo() { return 42; }
diff --git a/gcc/testsuite/g++.dg/modules/using-11_a.C b/gcc/testsuite/g++.dg/modules/using-11_a.C
new file mode 100644
index 00000000000..b846bc79203
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/using-11_a.C
@@ -0,0 +1,9 @@
+// PR c++/109679
+// { dg-additional-options "-fmodules-ts" }
+// { dg-module-cmi M }
+
+module;
+#include "using-11.h"
+
+export module M;
+export using ::foo;
diff --git a/gcc/testsuite/g++.dg/modules/using-11_b.C b/gcc/testsuite/g++.dg/modules/using-11_b.C
new file mode 100644
index 00000000000..736a48c98f2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/using-11_b.C
@@ -0,0 +1,8 @@
+// PR c++/109679
+// { dg-module-do link }
+// { dg-additional-options "-fmodules-ts" }
+
+import M;
+int main() {
+ return foo();
+}
--
2.43.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] c++: Export usings referring to global module fragment [PR109679]
2024-01-03 10:01 [PATCH] c++: Export usings referring to global module fragment [PR109679] Nathaniel Shead
@ 2024-01-06 22:25 ` Nathan Sidwell
0 siblings, 0 replies; 2+ messages in thread
From: Nathan Sidwell @ 2024-01-06 22:25 UTC (permalink / raw)
To: Nathaniel Shead, gcc-patches; +Cc: Jason Merrill
ok
On 1/3/24 05:01, Nathaniel Shead wrote:
> Bootstrapped & regtested on x86_64-pc-linux-gnu, OK for trunk?
>
> -- >8 --
>
> This patch stops 'add_binding_entity' from ignoring all names in the
> global module fragment, since they should still be exported if named
> in an exported using-declaration.
>
> PR c++/109679
>
> gcc/cp/ChangeLog:
>
> * module.cc (depset::hash::add_binding_entity): Don't skip names
> in the GMF if they've been exported with a using declaration.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/modules/using-11.h: New test.
> * g++.dg/modules/using-11_a.C: New test.
> * g++.dg/modules/using-11_b.C: New test.
>
> Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
> ---
> gcc/cp/module.cc | 6 ++++--
> gcc/testsuite/g++.dg/modules/using-11.h | 2 ++
> gcc/testsuite/g++.dg/modules/using-11_a.C | 9 +++++++++
> gcc/testsuite/g++.dg/modules/using-11_b.C | 8 ++++++++
> 4 files changed, 23 insertions(+), 2 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/modules/using-11.h
> create mode 100644 gcc/testsuite/g++.dg/modules/using-11_a.C
> create mode 100644 gcc/testsuite/g++.dg/modules/using-11_b.C
>
> diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
> index 82b61a2c2ad..865a4b77eca 100644
> --- a/gcc/cp/module.cc
> +++ b/gcc/cp/module.cc
> @@ -12837,8 +12837,10 @@ depset::hash::add_binding_entity (tree decl, WMB_Flags flags, void *data_)
> else if (TREE_CODE (inner) == TEMPLATE_DECL)
> inner = DECL_TEMPLATE_RESULT (inner);
>
> - if (!DECL_LANG_SPECIFIC (inner) || !DECL_MODULE_PURVIEW_P (inner))
> - /* Ignore global module fragment entities. */
> + if ((!DECL_LANG_SPECIFIC (inner) || !DECL_MODULE_PURVIEW_P (inner))
> + && !(flags & (WMB_Using | WMB_Export)))
> + /* Ignore global module fragment entities unless explicitly
> + exported with a using declaration. */
> return false;
>
> if (VAR_OR_FUNCTION_DECL_P (inner)
> diff --git a/gcc/testsuite/g++.dg/modules/using-11.h b/gcc/testsuite/g++.dg/modules/using-11.h
> new file mode 100644
> index 00000000000..64c1b0ca335
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/modules/using-11.h
> @@ -0,0 +1,2 @@
> +// PR c++/109679
> +inline int foo() { return 42; }
> diff --git a/gcc/testsuite/g++.dg/modules/using-11_a.C b/gcc/testsuite/g++.dg/modules/using-11_a.C
> new file mode 100644
> index 00000000000..b846bc79203
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/modules/using-11_a.C
> @@ -0,0 +1,9 @@
> +// PR c++/109679
> +// { dg-additional-options "-fmodules-ts" }
> +// { dg-module-cmi M }
> +
> +module;
> +#include "using-11.h"
> +
> +export module M;
> +export using ::foo;
> diff --git a/gcc/testsuite/g++.dg/modules/using-11_b.C b/gcc/testsuite/g++.dg/modules/using-11_b.C
> new file mode 100644
> index 00000000000..736a48c98f2
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/modules/using-11_b.C
> @@ -0,0 +1,8 @@
> +// PR c++/109679
> +// { dg-module-do link }
> +// { dg-additional-options "-fmodules-ts" }
> +
> +import M;
> +int main() {
> + return foo();
> +}
--
Nathan Sidwell
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-06 22:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-03 10:01 [PATCH] c++: Export usings referring to global module fragment [PR109679] Nathaniel Shead
2024-01-06 22:25 ` Nathan Sidwell
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).