From 63b531e6f8783e8624502d890dc422379de47a9a Mon Sep 17 00:00:00 2001 From: Nathaniel Shead Date: Wed, 3 Jan 2024 15:29:51 +1100 Subject: c++: Export usings referring to global module fragment [PR109679] 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 --- gcc/cp/module.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gcc/cp/module.cc') diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index a947616..e0759a9 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -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) -- cgit v1.1