FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: Export usings referring to global module fragment [PR109679]

Browse source 
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:#️⃣: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>
This commit is contained in:
Nathaniel Shead 2024-01-03 15:29:51 +11:00
parent 7f24446a3c
commit 63b531e6f8
4 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/module.cc
View file

@ -12832,8 +12832,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)

2
gcc/testsuite/g++.dg/modules/using-11.h Normal file
View file

@ -0,0 +1,2 @@
// PR c++/109679
inline int foo() { return 42; }

9
gcc/testsuite/g++.dg/modules/using-11_a.C Normal file
View file

@ -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;

8
gcc/testsuite/g++.dg/modules/using-11_b.C Normal file
View file

@ -0,0 +1,8 @@
// PR c++/109679
// { dg-module-do link }
// { dg-additional-options "-fmodules-ts" }
import M;
int main() {
return foo();
}