Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< --
We need to remember that the ::operator new is replaceable to avoid a bogus error about __builtin_operator_new finding a non-replaceable function. This affected __get_temporary_buffer in stl_tempbuf.h. gcc/cp/ChangeLog: * module.cc (trees_out::core_bools): Write replaceable_operator. (trees_in::core_bools): Read it. gcc/testsuite/ChangeLog: * g++.dg/modules/operator-2_a.C: New test. * g++.dg/modules/operator-2_b.C: New test. --- gcc/cp/module.cc | 2 ++ gcc/testsuite/g++.dg/modules/operator-2_a.C | 14 ++++++++++++++ gcc/testsuite/g++.dg/modules/operator-2_b.C | 8 ++++++++ 3 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/g++.dg/modules/operator-2_a.C create mode 100644 gcc/testsuite/g++.dg/modules/operator-2_b.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 7288c46a7ba..4fbe522264b 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -5640,6 +5640,7 @@ trees_out::core_bools (tree t, bits_out& bits) WB (t->function_decl.has_debug_args_flag); WB (t->function_decl.versioned_function); + WB (t->function_decl.replaceable_operator); /* decl_type is a (misnamed) 2 bit discriminator. */ unsigned kind = t->function_decl.decl_type; @@ -5796,6 +5797,7 @@ trees_in::core_bools (tree t, bits_in& bits) RB (t->function_decl.has_debug_args_flag); RB (t->function_decl.versioned_function); + RB (t->function_decl.replaceable_operator); /* decl_type is a (misnamed) 2 bit discriminator. */ unsigned kind = 0; diff --git a/gcc/testsuite/g++.dg/modules/operator-2_a.C b/gcc/testsuite/g++.dg/modules/operator-2_a.C new file mode 100644 index 00000000000..0b1f6e80422 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/operator-2_a.C @@ -0,0 +1,14 @@ +// { dg-additional-options -fmodules } +// { dg-module-cmi M } + +module; + +#include <new> + +export module M; + +export template <class T> +inline T* alloc (__SIZE_TYPE__ n) +{ + return (T*) __builtin_operator_new (n * sizeof (T), std::nothrow_t{}); +}; diff --git a/gcc/testsuite/g++.dg/modules/operator-2_b.C b/gcc/testsuite/g++.dg/modules/operator-2_b.C new file mode 100644 index 00000000000..fb21ccb6d30 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/operator-2_b.C @@ -0,0 +1,8 @@ +// { dg-additional-options -fmodules } + +import M; + +int main() +{ + int *p = alloc<int>(42); +} base-commit: 9193641d1695293006ed0b818bb4161a1b6fbed2 -- 2.47.1