TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 14:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

c++: module std and exception_ptr

Browse Source 
exception_ptr.h contains

  namespace __exception_ptr
  {
    class exception_ptr;
  }
  using __exception_ptr::exception_ptr;

so when module std tries to 'export using std::exception_ptr', it names
another using-directive rather than the class directly, so __exception_ptr
is never explicitly opened in module purview.

gcc/cp/ChangeLog:

	* module.cc (depset::hash::add_binding_entity): Set
	DECL_MODULE_PURVIEW_P instead of asserting.

gcc/testsuite/ChangeLog:

	* g++.dg/modules/using-20_a.C: New test.
This commit is contained in:
Jason Merrill
2024-06-12 00:13:45 -04:00
parent 7bf072e87a
commit f8356d66cf
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/module.cc
View File

@@ -13253,8 +13253,11 @@ depset::hash::add_binding_entity (tree decl, WMB_Flags flags, void *data_)
data->met_namespace = true;
if (data->hash->add_namespace_entities (decl, data->partitions))
{
/* It contains an exported thing, so it is exported. */
gcc_checking_assert (DECL_MODULE_PURVIEW_P (decl));
/* It contains an exported thing, so it is exported.
We used to assert DECL_MODULE_PURVIEW_P, but that fails for a
namespace like std::__exception_ptr which is never opened in
module purview; the exporting using finds another using. */
DECL_MODULE_PURVIEW_P (decl) = true;
DECL_MODULE_EXPORT_P (decl) = true;
}

14
gcc/testsuite/g++.dg/modules/using-20_a.C Normal file
View File

@@ -0,0 +1,14 @@
// { dg-additional-options "-fmodules-ts -fdump-lang-module -Wno-global-module" }
// { dg-final { scan-lang-dump {Writing definition '::foo::bar::baz'} module } }
module;
namespace foo {
namespace bar {
struct baz { };
}
using bar::baz;
}
export module foo;
namespace foo {
export using foo::baz;
}