Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
Hi Still no one to complete this review ? Thanks On 07/10/2023 21:32, François Dumont wrote: I've been told that previous patch generated with 'git diff -b' was not applying properly so here is the same patch again with a simple 'git diff'. On 07/10/2023 14:25, François Dumont wrote: Hi Here is a rebased version of this patch. There are few test failures when running 'make check-c++' but nothing new. Still, there are 2 patches awaiting validation to fix some of them, PR c++/111524 to fix another bunch and I fear that we will have to live with the others. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. To do support a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and _GLIBCXX_USE_CXX11_ABI. The main change is that std::__cow_string is now defined whenever _GLIBCXX_USE_DUAL_ABI or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available std::string in case of dual abi and a subset of it when it's not. On the other side std::__sso_string is defined only when _GLIBCXX_USE_DUAL_ABI is true and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a typedef for the cow std::string implementation when dual abi is disabled and cow string is being used. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi when enable_symvers is gnu-versioned-namespace. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. * src/c++11/string-inst.cc: Add sizeof/alignof static_assert on stdexcept __cow_string definition. (_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS): Define following _GLIBCXX_USE_CXX11_ABI value. [_GLIBCXX_USE_CXX11_ABI && !_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS]: Define _GLIBCXX_DEFINING_COW_STRING_INSTANTIATIONS. Include . Define basic_string as __std_cow_string for the current translation unit. * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-string-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-io-inst.cc
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On 09/10/2023 16:42, Iain Sandoe wrote:
Hi François,
On 7 Oct 2023, at 20:32, François Dumont wrote:
I've been told that previous patch generated with 'git diff -b' was not
applying properly so here is the same patch again with a simple 'git diff'.
Thanks, that did fix it - There are some training whitespaces in the config
files, but I suspect that they need to be there since those have values
appended during the configuration.
You're talking about the ones coming from regenerated Makefile.in and
configure I guess. I prefer not to edit those, those trailing
whitespaces are already in.
Anyway, with this + the coroutines and contract v2 (weak def) fix, plus a local
patch to enable versioned namespace on Darwin, I get results comparable with
the non-versioned case - but one more patchlet is needed on yours (to allow
for targets using emultated TLS):
diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
index 9fab8bead15..b7167fc0c2f 100644
--- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
+++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
@@ -78,6 +78,7 @@ GLIBCXX_8.0 {
# thread/mutex/condition_variable/future
__once_proxy;
+__emutls_v._ZNSt3__81?__once_call*;
I can add this one, sure, even if it could be part of a dedicated patch.
I'm surprised that we do not need the __once_callable emul symbol too,
it would be more consistent with the non-versioned mode.
I'm pretty sure there are a bunch of other symbols missing, but this
mode is seldomly tested...
# std::__convert_to_v
_ZNSt3__814__convert_to_v*;
thanks
Iain
On 07/10/2023 14:25, François Dumont wrote:
Hi
Here is a rebased version of this patch.
There are few test failures when running 'make check-c++' but nothing new.
Still, there are 2 patches awaiting validation to fix some of them, PR
c++/111524 to fix another bunch and I fear that we will have to live with the
others.
libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077]
Use cxx11 abi when activating versioned namespace mode. To do support
a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and
_GLIBCXX_USE_CXX11_ABI.
The main change is that std::__cow_string is now defined whenever
_GLIBCXX_USE_DUAL_ABI
or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available
std::string in
case of dual abi and a subset of it when it's not.
On the other side std::__sso_string is defined only when
_GLIBCXX_USE_DUAL_ABI is true
and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a
typedef for the
cow std::string implementation when dual abi is disabled and cow string is
being used.
libstdcxx-v3/ChangeLog:
PR libstdc++/83077
* acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to
"new" libstdcxx abi
when enable_symvers is gnu-versioned-namespace.
* config/locale/dragonfly/monetary_members.cc
[!_GLIBCXX_USE_DUAL_ABI]: Define money_base
members.
* config/locale/generic/monetary_members.cc
[!_GLIBCXX_USE_DUAL_ABI]: Likewise.
* config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]:
Likewise.
* config/locale/gnu/numeric_members.cc
[!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define.
* configure: Regenerate.
* include/bits/c++config
[_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11,
_GLIBCXX_BEGIN_NAMESPACE_CXX11):
Define empty.
[_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11,
_GLIBCXX_DEFAULT_ABI_TAG):
Likewise.
* include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a
light version of COW
basic_string as __std_cow_string for use in stdexcept.
* include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define
__cow_string.
(__cow_string(const char*)): New.
(__cow_string::c_str()): New.
* python/libstdcxx/v6/printers.py (StdStringPrinter::__init__):
Set self.new_string to True
when std::__8::basic_string type is found.
* src/Makefile.am
[ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am (cxx11_abi_sources): Rename into...
(dual_abi_sources): ...this. Also move cow-local_init.cc,
cxx11-hash_tr1.cc,
cxx11-ios_failure.cc entries to...
(sources): ...this.
(extra_string_inst_sources): Move cow-fstream-inst.cc,
cow-sstream-inst.cc, cow-string-inst.cc,
cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc,
cxx11-locale-inst.cc,
cxx11-wlocale-inst.cc entries to...
(inst_sources): ...this.
* src/c++11/Makefile.in:
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
> On 9 Oct 2023, at 15:42, Iain Sandoe wrote:
>> On 7 Oct 2023, at 20:32, François Dumont wrote:
>>
>> I've been told that previous patch generated with 'git diff -b' was not
>> applying properly so here is the same patch again with a simple 'git diff'.
>
> Thanks, that did fix it - There are some training whitespaces in the config
> files, but I suspect that they need to be there since those have values
> appended during the configuration.
>
> Anyway, with this + the coroutines and contract v2 (weak def) fix, plus a
> local patch to enable versioned namespace on Darwin, I get results comparable
> with the non-versioned case - but one more patchlet is needed on yours (to
> allow for targets using emultated TLS):
>
> diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
> b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
> index 9fab8bead15..b7167fc0c2f 100644
> --- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
> +++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
> @@ -78,6 +78,7 @@ GLIBCXX_8.0 {
>
> # thread/mutex/condition_variable/future
> __once_proxy;
> +__emutls_v._ZNSt3__81?__once_call*;
>
> # std::__convert_to_v
> _ZNSt3__814__convert_to_v*;
Having said this, since the versioned lib is an ABI-break, perhaps we should
also take the opportunity
to fix the once_call impl. here too?
(at least the fix I made locally does not need the TLS var, so ths would then
be moot)
Iain
>
> thanks
> Iain
>
>>
>>
>> On 07/10/2023 14:25, François Dumont wrote:
>>> Hi
>>>
>>> Here is a rebased version of this patch.
>>>
>>> There are few test failures when running 'make check-c++' but nothing new.
>>>
>>> Still, there are 2 patches awaiting validation to fix some of them, PR
>>> c++/111524 to fix another bunch and I fear that we will have to live with
>>> the others.
>>>
>>>libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077]
>>>
>>>Use cxx11 abi when activating versioned namespace mode. To do support
>>>a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and
>>> _GLIBCXX_USE_CXX11_ABI.
>>>
>>>The main change is that std::__cow_string is now defined whenever
>>> _GLIBCXX_USE_DUAL_ABI
>>>or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available
>>> std::string in
>>>case of dual abi and a subset of it when it's not.
>>>
>>>On the other side std::__sso_string is defined only when
>>> _GLIBCXX_USE_DUAL_ABI is true
>>>and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a
>>> typedef for the
>>>cow std::string implementation when dual abi is disabled and cow string
>>> is being used.
>>>
>>>libstdcxx-v3/ChangeLog:
>>>
>>>PR libstdc++/83077
>>>* acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to
>>> "new" libstdcxx abi
>>>when enable_symvers is gnu-versioned-namespace.
>>>* config/locale/dragonfly/monetary_members.cc
>>> [!_GLIBCXX_USE_DUAL_ABI]: Define money_base
>>>members.
>>>* config/locale/generic/monetary_members.cc
>>> [!_GLIBCXX_USE_DUAL_ABI]: Likewise.
>>>* config/locale/gnu/monetary_members.cc
>>> [!_GLIBCXX_USE_DUAL_ABI]: Likewise.
>>>* config/locale/gnu/numeric_members.cc
>>>[!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define.
>>>* configure: Regenerate.
>>>* include/bits/c++config
>>>[_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11,
>>> _GLIBCXX_BEGIN_NAMESPACE_CXX11):
>>>Define empty.
>>> [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11,
>>> _GLIBCXX_DEFAULT_ABI_TAG):
>>>Likewise.
>>>* include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a
>>> light version of COW
>>>basic_string as __std_cow_string for use in stdexcept.
>>>* include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define
>>> __cow_string.
>>>(__cow_string(const char*)): New.
>>>(__cow_string::c_str()): New.
>>>* python/libstdcxx/v6/printers.py (StdStringPrinter::__init__):
>>> Set self.new_string to True
>>>when std::__8::basic_string type is found.
>>>* src/Makefile.am
>>> [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty.
>>>* src/Makefile.in: Regenerate.
>>>* src/c++11/Makefile.am (cxx11_abi_sources): Rename into...
>>>(dual_abi_sources): ...this. Also move cow-local_init.cc,
>>> cxx11-hash_tr1.cc,
>>>cxx11-ios_failure.cc entries to...
>>>(sources): ...this.
>>>(extra_string_inst_sources): Move cow-fstream-inst.cc,
>>> cow-sstream-inst.cc, cow-string-inst.cc,
>>>cow-string-io-inst.cc, cow-wtring-inst.cc,
>>> cow-wstring-io-inst.cc, cxx11-locale-inst.cc,
>>>cxx11-wlocale-inst.cc entries to...
>>>(inst_sources): ...this.
>>>
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
Hi François,
> On 7 Oct 2023, at 20:32, François Dumont wrote:
>
> I've been told that previous patch generated with 'git diff -b' was not
> applying properly so here is the same patch again with a simple 'git diff'.
Thanks, that did fix it - There are some training whitespaces in the config
files, but I suspect that they need to be there since those have values
appended during the configuration.
Anyway, with this + the coroutines and contract v2 (weak def) fix, plus a local
patch to enable versioned namespace on Darwin, I get results comparable with
the non-versioned case - but one more patchlet is needed on yours (to allow
for targets using emultated TLS):
diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
index 9fab8bead15..b7167fc0c2f 100644
--- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
+++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
@@ -78,6 +78,7 @@ GLIBCXX_8.0 {
# thread/mutex/condition_variable/future
__once_proxy;
+__emutls_v._ZNSt3__81?__once_call*;
# std::__convert_to_v
_ZNSt3__814__convert_to_v*;
thanks
Iain
>
>
> On 07/10/2023 14:25, François Dumont wrote:
>> Hi
>>
>> Here is a rebased version of this patch.
>>
>> There are few test failures when running 'make check-c++' but nothing new.
>>
>> Still, there are 2 patches awaiting validation to fix some of them, PR
>> c++/111524 to fix another bunch and I fear that we will have to live with
>> the others.
>>
>> libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077]
>>
>> Use cxx11 abi when activating versioned namespace mode. To do support
>> a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and
>> _GLIBCXX_USE_CXX11_ABI.
>>
>> The main change is that std::__cow_string is now defined whenever
>> _GLIBCXX_USE_DUAL_ABI
>> or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available
>> std::string in
>> case of dual abi and a subset of it when it's not.
>>
>> On the other side std::__sso_string is defined only when
>> _GLIBCXX_USE_DUAL_ABI is true
>> and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a
>> typedef for the
>> cow std::string implementation when dual abi is disabled and cow string
>> is being used.
>>
>> libstdcxx-v3/ChangeLog:
>>
>> PR libstdc++/83077
>> * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to
>> "new" libstdcxx abi
>> when enable_symvers is gnu-versioned-namespace.
>> * config/locale/dragonfly/monetary_members.cc
>> [!_GLIBCXX_USE_DUAL_ABI]: Define money_base
>> members.
>> * config/locale/generic/monetary_members.cc
>> [!_GLIBCXX_USE_DUAL_ABI]: Likewise.
>> * config/locale/gnu/monetary_members.cc
>> [!_GLIBCXX_USE_DUAL_ABI]: Likewise.
>> * config/locale/gnu/numeric_members.cc
>> [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define.
>> * configure: Regenerate.
>> * include/bits/c++config
>> [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11,
>> _GLIBCXX_BEGIN_NAMESPACE_CXX11):
>> Define empty.
>> [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11,
>> _GLIBCXX_DEFAULT_ABI_TAG):
>> Likewise.
>> * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a
>> light version of COW
>> basic_string as __std_cow_string for use in stdexcept.
>> * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define
>> __cow_string.
>> (__cow_string(const char*)): New.
>> (__cow_string::c_str()): New.
>> * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__):
>> Set self.new_string to True
>> when std::__8::basic_string type is found.
>> * src/Makefile.am
>> [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty.
>> * src/Makefile.in: Regenerate.
>> * src/c++11/Makefile.am (cxx11_abi_sources): Rename into...
>> (dual_abi_sources): ...this. Also move cow-local_init.cc,
>> cxx11-hash_tr1.cc,
>> cxx11-ios_failure.cc entries to...
>> (sources): ...this.
>> (extra_string_inst_sources): Move cow-fstream-inst.cc,
>> cow-sstream-inst.cc, cow-string-inst.cc,
>> cow-string-io-inst.cc, cow-wtring-inst.cc,
>> cow-wstring-io-inst.cc, cxx11-locale-inst.cc,
>> cxx11-wlocale-inst.cc entries to...
>> (inst_sources): ...this.
>> * src/c++11/Makefile.in: Regenerate.
>> * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip
>> definitions.
>> * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip
>> definitions.
>> * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip
>> definitions.
>> *
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
I've been told that previous patch generated with 'git diff -b' was not applying properly so here is the same patch again with a simple 'git diff'. On 07/10/2023 14:25, François Dumont wrote: Hi Here is a rebased version of this patch. There are few test failures when running 'make check-c++' but nothing new. Still, there are 2 patches awaiting validation to fix some of them, PR c++/111524 to fix another bunch and I fear that we will have to live with the others. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. To do support a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and _GLIBCXX_USE_CXX11_ABI. The main change is that std::__cow_string is now defined whenever _GLIBCXX_USE_DUAL_ABI or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available std::string in case of dual abi and a subset of it when it's not. On the other side std::__sso_string is defined only when _GLIBCXX_USE_DUAL_ABI is true and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a typedef for the cow std::string implementation when dual abi is disabled and cow string is being used. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi when enable_symvers is gnu-versioned-namespace. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. * src/c++11/string-inst.cc: Add sizeof/alignof static_assert on stdexcept __cow_string definition. (_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS): Define following _GLIBCXX_USE_CXX11_ABI value. [_GLIBCXX_USE_CXX11_ABI && !_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS]: Define _GLIBCXX_DEFINING_COW_STRING_INSTANTIATIONS. Include . Define basic_string as __std_cow_string for the current translation unit. * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-string-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-hash_tr1.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
Hi Here is a rebased version of this patch. There are few test failures when running 'make check-c++' but nothing new. Still, there are 2 patches awaiting validation to fix some of them, PR c++/111524 to fix another bunch and I fear that we will have to live with the others. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. To do support a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and _GLIBCXX_USE_CXX11_ABI. The main change is that std::__cow_string is now defined whenever _GLIBCXX_USE_DUAL_ABI or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available std::string in case of dual abi and a subset of it when it's not. On the other side std::__sso_string is defined only when _GLIBCXX_USE_DUAL_ABI is true and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a typedef for the cow std::string implementation when dual abi is disabled and cow string is being used. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi when enable_symvers is gnu-versioned-namespace. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. * src/c++11/string-inst.cc: Add sizeof/alignof static_assert on stdexcept __cow_string definition. (_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS): Define following _GLIBCXX_USE_CXX11_ABI value. [_GLIBCXX_USE_CXX11_ABI && !_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS]: Define _GLIBCXX_DEFINING_COW_STRING_INSTANTIATIONS. Include . Define basic_string as __std_cow_string for the current translation unit. * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-string-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-hash_tr1.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-ios_failure.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. [!_GLIBCXX_USE_DUAL_ABI] (__ios_failure): Remove. *
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
I've now prepared the patch to support following config: --disable-libstdcxx-dual-abi --with-default-libstdcxx-abi=new and so detected yet another problem with src/c++98/compatibility.cc. We need basic_istream<>::ignore(streamsize) definitions that rely here but not the rest of it. François On 17/08/2023 19:17, François Dumont wrote: Another fix to define __cow_string(const std::string&) in cxx11-stdexcept.cc even if ! _GLIBCXX_USE_DUAL_ABI. On 13/08/2023 21:51, François Dumont wrote: Here is another version with enhanced sizeof/alignof static_assert in string-inst.cc for the std::__cow_string definition from . The assertions in cow-stdexcept.cc are now checking the definition which is in the same file. On 13/08/2023 15:27, François Dumont wrote: Here is the fixed patch tested in all 3 modes: - _GLIBCXX_USE_DUAL_ABI - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI I don't know what you have in mind for the change below but I wanted to let you know that I tried to put COW std::basic_string into a nested __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on string-inst.cc so I preferred the macro substitution approach. There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are unrelated with my changes. I'll propose fixes in coming days. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. To do support a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and _GLIBCXX_USE_CXX11_ABI. The main change is that std::__cow_string is now defined whenever _GLIBCXX_USE_DUAL_ABI or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available std::string in case of dual abi and a subset of it when it's not. On the other side std::__sso_string is defined only when _GLIBCXX_USE_DUAL_ABI is true and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a typedef for the cow std::string implementation when dual abi is disabled and cow string is being used. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. Move static_assert to check std::_cow_string abi layout to... * src/c++11/string-inst.cc:
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
Here is a rebased patch following the resize_and_overwrite change.
I confirm that tests are now fixed after the change in tzdb.cc.
I'll prepare a fix for those tests still but preparing also a test to
detect allocations in the lib.
François
On 17/08/2023 21:44, Jonathan Wakely wrote:
On Thu, 17 Aug 2023 at 20:37, Jonathan Wakely wrote:
On Thu, 17 Aug 2023 at 19:59, Jonathan Wakely wrote:
On Thu, 17 Aug 2023 at 18:40, François Dumont wrote:
On 17/08/2023 19:22, Jonathan Wakely wrote:
On Sun, 13 Aug 2023 at 14:27, François Dumont via Libstdc++
wrote:
Here is the fixed patch tested in all 3 modes:
- _GLIBCXX_USE_DUAL_ABI
- !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI
- !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI
I don't know what you have in mind for the change below but I wanted to
let you know that I tried to put COW std::basic_string into a nested
__cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on
string-inst.cc so I preferred the macro substitution approach.
I was thinking of implementing the necessary special members functions
of __cow_string directly, so they are ABI compatible with the COW
std::basic_string but don't actually reuse the code. That would mean
we don't need to compile and instantiate the whole COW string just to
use a few members from it. But that can be done later, the macro
approach seems OK for now.
You'll see that when cow_string.h is included while
_GLIBCXX_USE_CXX11_ABI == 1 then I am hiding a big part of the
basic_string definition. Initially it was to avoid to have to include
basic_string.tcc but it is also a lot of useless code indeed.
There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are
unrelated with my changes. I'll propose fixes in coming days.
Which tests? I run the entire testsuite with
-D_GLIBCXX_USE_CXX11_ABI=0 several times per day and I'm not seeing
failures.
I'll review the patch ASAP, thanks for working on it.
So far the only issue I found are in the mode !_GLIBCXX_USE_DUAL_ABI &&
!_GLIBCXX_USE_CXX11_ABI. They are:
23_containers/unordered_map/96088.cc
23_containers/unordered_multimap/96088.cc
23_containers/unordered_multiset/96088.cc
23_containers/unordered_set/96088.cc
ext/debug_allocator/check_new.cc
ext/malloc_allocator/check_new.cc
ext/malloc_allocator/deallocate_local.cc
ext/new_allocator/deallocate_local.cc
ext/pool_allocator/allocate_chunk.cc
ext/throw_allocator/deallocate_local.cc
Ah yes, they fail for !USE_DUAL_ABI builds, I wonder why.
/home/test/src/gcc/libstdc++-v3/testsuite/23_containers/unordered_map/96088.
cc:44: void test01(): Assertion '__gnu_test::counter::count() == 3' failed.
FAIL: 23_containers/unordered_map/96088.cc execution test
It's due to this global object in src/c++20/tzdb.cc:
1081const string tzdata_file = "/tzdata.zi";
When the library uses COW strings that requires an allocation before
main, which uses the replacement operator new in the tests, which
fails to allocate. For example, in 22_locale/locale/cons/12352.cc we
have this function used by operator new:
int times_to_fail = 0;
void* allocate(std::size_t n)
{
if (!times_to_fail--)
return 0;
The counter is initially zero, so if we try to allocate before it gets
set to a non-zero value in test01() then we fail.
The test should not assume no allocations before main() begins. The
simplest way to do that is with another global that says "we have
started testing" e.g.
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
@@ -26,11 +26,12 @@
#include
#include
+bool tests_started = false;
int times_to_fail = 0;
void* allocate(std::size_t n)
{
- if (!times_to_fail--)
+ if (tests_started && !times_to_fail--)
return 0;
void* ret = std::malloc(n ? n : 1);
@@ -106,6 +107,8 @@ void operator delete[](void* p, const
std::nothrow_t&) throw()
// libstdc++/12352
void test01(int iters)
{
+ tests_started = true;
+
for (int j = 0; j < iters; ++j)
{
for (int i = 0; i < 100; ++i)
This way the replacement operator new doesn't start intentionally
failing until we ask it to do so.
I'll replace the global std::string objects with std::string_view
objects, so that they don't allocate even if the library only uses COW
strings.
We should still fix those tests though.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index b25378eaace..322f1e42611 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -4875,12 +4875,16 @@ dnl
AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI], [
GLIBCXX_ENABLE(libstdcxx-dual-abi,$1,,[support two versions of std::string])
if test x$enable_symvers = xgnu-versioned-namespace; then
-# gnu-versioned-namespace is incompatible with the dual ABI.
-enable_libstdcxx_dual_abi="no"
- fi
- if test x"$enable_libstdcxx_dual_abi" != xyes; then
+# gnu-versioned-namespace is incompatible with the dual ABI...
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On Thu, 17 Aug 2023 at 20:44, Jonathan Wakely wrote:
>
> On Thu, 17 Aug 2023 at 20:37, Jonathan Wakely wrote:
> >
> > On Thu, 17 Aug 2023 at 19:59, Jonathan Wakely wrote:
> > >
> > > On Thu, 17 Aug 2023 at 18:40, François Dumont
> > > wrote:
> > > >
> > > >
> > > > On 17/08/2023 19:22, Jonathan Wakely wrote:
> > > > > On Sun, 13 Aug 2023 at 14:27, François Dumont via Libstdc++
> > > > > wrote:
> > > > >> Here is the fixed patch tested in all 3 modes:
> > > > >>
> > > > >> - _GLIBCXX_USE_DUAL_ABI
> > > > >>
> > > > >> - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI
> > > > >>
> > > > >> - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI
> > > > >>
> > > > >> I don't know what you have in mind for the change below but I wanted
> > > > >> to
> > > > >> let you know that I tried to put COW std::basic_string into a nested
> > > > >> __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact
> > > > >> on
> > > > >> string-inst.cc so I preferred the macro substitution approach.
> > > > > I was thinking of implementing the necessary special members functions
> > > > > of __cow_string directly, so they are ABI compatible with the COW
> > > > > std::basic_string but don't actually reuse the code. That would mean
> > > > > we don't need to compile and instantiate the whole COW string just to
> > > > > use a few members from it. But that can be done later, the macro
> > > > > approach seems OK for now.
> > > >
> > > > You'll see that when cow_string.h is included while
> > > > _GLIBCXX_USE_CXX11_ABI == 1 then I am hiding a big part of the
> > > > basic_string definition. Initially it was to avoid to have to include
> > > > basic_string.tcc but it is also a lot of useless code indeed.
> > > >
> > > >
> > > > >
> > > > >> There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are
> > > > >> unrelated with my changes. I'll propose fixes in coming days.
> > > > > Which tests? I run the entire testsuite with
> > > > > -D_GLIBCXX_USE_CXX11_ABI=0 several times per day and I'm not seeing
> > > > > failures.
> > > > >
> > > > > I'll review the patch ASAP, thanks for working on it.
> > > > >
> > > > So far the only issue I found are in the mode !_GLIBCXX_USE_DUAL_ABI &&
> > > > !_GLIBCXX_USE_CXX11_ABI. They are:
> > > >
> > > > 23_containers/unordered_map/96088.cc
> > > > 23_containers/unordered_multimap/96088.cc
> > > > 23_containers/unordered_multiset/96088.cc
> > > > 23_containers/unordered_set/96088.cc
> > > > ext/debug_allocator/check_new.cc
> > > > ext/malloc_allocator/check_new.cc
> > > > ext/malloc_allocator/deallocate_local.cc
> > > > ext/new_allocator/deallocate_local.cc
> > > > ext/pool_allocator/allocate_chunk.cc
> > > > ext/throw_allocator/deallocate_local.cc
> > >
> > > Ah yes, they fail for !USE_DUAL_ABI builds, I wonder why.
> > >
> > > /home/test/src/gcc/libstdc++-v3/testsuite/23_containers/unordered_map/96088.
> > > cc:44: void test01(): Assertion '__gnu_test::counter::count() == 3'
> > > failed.
> > > FAIL: 23_containers/unordered_map/96088.cc execution test
> >
> > It's due to this global object in src/c++20/tzdb.cc:
> > 1081const string tzdata_file = "/tzdata.zi";
> >
> > When the library uses COW strings that requires an allocation before
> > main, which uses the replacement operator new in the tests, which
> > fails to allocate. For example, in 22_locale/locale/cons/12352.cc we
> > have this function used by operator new:
> >
> > int times_to_fail = 0;
> >
> > void* allocate(std::size_t n)
> > {
> > if (!times_to_fail--)
> > return 0;
> >
> > The counter is initially zero, so if we try to allocate before it gets
> > set to a non-zero value in test01() then we fail.
> >
> > The test should not assume no allocations before main() begins. The
> > simplest way to do that is with another global that says "we have
> > started testing" e.g.
> >
> > --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
> > +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
> > @@ -26,11 +26,12 @@
> > #include
> > #include
> >
> > +bool tests_started = false;
> > int times_to_fail = 0;
> >
> > void* allocate(std::size_t n)
> > {
> > - if (!times_to_fail--)
> > + if (tests_started && !times_to_fail--)
> > return 0;
> >
> >void* ret = std::malloc(n ? n : 1);
> > @@ -106,6 +107,8 @@ void operator delete[](void* p, const
> > std::nothrow_t&) throw()
> > // libstdc++/12352
> > void test01(int iters)
> > {
> > + tests_started = true;
> > +
> >for (int j = 0; j < iters; ++j)
> > {
> >for (int i = 0; i < 100; ++i)
> >
> >
> > This way the replacement operator new doesn't start intentionally
> > failing until we ask it to do so.
>
> I'll replace the global std::string objects with std::string_view
> objects, so that they don't allocate even if the library only uses COW
> strings.
Done at r14-3309-gd82a85b6161cbe
>
> We should still fix those tests though.
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On Thu, 17 Aug 2023 at 20:37, Jonathan Wakely wrote:
>
> On Thu, 17 Aug 2023 at 19:59, Jonathan Wakely wrote:
> >
> > On Thu, 17 Aug 2023 at 18:40, François Dumont wrote:
> > >
> > >
> > > On 17/08/2023 19:22, Jonathan Wakely wrote:
> > > > On Sun, 13 Aug 2023 at 14:27, François Dumont via Libstdc++
> > > > wrote:
> > > >> Here is the fixed patch tested in all 3 modes:
> > > >>
> > > >> - _GLIBCXX_USE_DUAL_ABI
> > > >>
> > > >> - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI
> > > >>
> > > >> - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI
> > > >>
> > > >> I don't know what you have in mind for the change below but I wanted to
> > > >> let you know that I tried to put COW std::basic_string into a nested
> > > >> __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on
> > > >> string-inst.cc so I preferred the macro substitution approach.
> > > > I was thinking of implementing the necessary special members functions
> > > > of __cow_string directly, so they are ABI compatible with the COW
> > > > std::basic_string but don't actually reuse the code. That would mean
> > > > we don't need to compile and instantiate the whole COW string just to
> > > > use a few members from it. But that can be done later, the macro
> > > > approach seems OK for now.
> > >
> > > You'll see that when cow_string.h is included while
> > > _GLIBCXX_USE_CXX11_ABI == 1 then I am hiding a big part of the
> > > basic_string definition. Initially it was to avoid to have to include
> > > basic_string.tcc but it is also a lot of useless code indeed.
> > >
> > >
> > > >
> > > >> There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are
> > > >> unrelated with my changes. I'll propose fixes in coming days.
> > > > Which tests? I run the entire testsuite with
> > > > -D_GLIBCXX_USE_CXX11_ABI=0 several times per day and I'm not seeing
> > > > failures.
> > > >
> > > > I'll review the patch ASAP, thanks for working on it.
> > > >
> > > So far the only issue I found are in the mode !_GLIBCXX_USE_DUAL_ABI &&
> > > !_GLIBCXX_USE_CXX11_ABI. They are:
> > >
> > > 23_containers/unordered_map/96088.cc
> > > 23_containers/unordered_multimap/96088.cc
> > > 23_containers/unordered_multiset/96088.cc
> > > 23_containers/unordered_set/96088.cc
> > > ext/debug_allocator/check_new.cc
> > > ext/malloc_allocator/check_new.cc
> > > ext/malloc_allocator/deallocate_local.cc
> > > ext/new_allocator/deallocate_local.cc
> > > ext/pool_allocator/allocate_chunk.cc
> > > ext/throw_allocator/deallocate_local.cc
> >
> > Ah yes, they fail for !USE_DUAL_ABI builds, I wonder why.
> >
> > /home/test/src/gcc/libstdc++-v3/testsuite/23_containers/unordered_map/96088.
> > cc:44: void test01(): Assertion '__gnu_test::counter::count() == 3' failed.
> > FAIL: 23_containers/unordered_map/96088.cc execution test
>
> It's due to this global object in src/c++20/tzdb.cc:
> 1081const string tzdata_file = "/tzdata.zi";
>
> When the library uses COW strings that requires an allocation before
> main, which uses the replacement operator new in the tests, which
> fails to allocate. For example, in 22_locale/locale/cons/12352.cc we
> have this function used by operator new:
>
> int times_to_fail = 0;
>
> void* allocate(std::size_t n)
> {
> if (!times_to_fail--)
> return 0;
>
> The counter is initially zero, so if we try to allocate before it gets
> set to a non-zero value in test01() then we fail.
>
> The test should not assume no allocations before main() begins. The
> simplest way to do that is with another global that says "we have
> started testing" e.g.
>
> --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
> +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
> @@ -26,11 +26,12 @@
> #include
> #include
>
> +bool tests_started = false;
> int times_to_fail = 0;
>
> void* allocate(std::size_t n)
> {
> - if (!times_to_fail--)
> + if (tests_started && !times_to_fail--)
> return 0;
>
>void* ret = std::malloc(n ? n : 1);
> @@ -106,6 +107,8 @@ void operator delete[](void* p, const
> std::nothrow_t&) throw()
> // libstdc++/12352
> void test01(int iters)
> {
> + tests_started = true;
> +
>for (int j = 0; j < iters; ++j)
> {
>for (int i = 0; i < 100; ++i)
>
>
> This way the replacement operator new doesn't start intentionally
> failing until we ask it to do so.
I'll replace the global std::string objects with std::string_view
objects, so that they don't allocate even if the library only uses COW
strings.
We should still fix those tests though.
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On Thu, 17 Aug 2023 at 19:59, Jonathan Wakely wrote:
>
> On Thu, 17 Aug 2023 at 18:40, François Dumont wrote:
> >
> >
> > On 17/08/2023 19:22, Jonathan Wakely wrote:
> > > On Sun, 13 Aug 2023 at 14:27, François Dumont via Libstdc++
> > > wrote:
> > >> Here is the fixed patch tested in all 3 modes:
> > >>
> > >> - _GLIBCXX_USE_DUAL_ABI
> > >>
> > >> - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI
> > >>
> > >> - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI
> > >>
> > >> I don't know what you have in mind for the change below but I wanted to
> > >> let you know that I tried to put COW std::basic_string into a nested
> > >> __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on
> > >> string-inst.cc so I preferred the macro substitution approach.
> > > I was thinking of implementing the necessary special members functions
> > > of __cow_string directly, so they are ABI compatible with the COW
> > > std::basic_string but don't actually reuse the code. That would mean
> > > we don't need to compile and instantiate the whole COW string just to
> > > use a few members from it. But that can be done later, the macro
> > > approach seems OK for now.
> >
> > You'll see that when cow_string.h is included while
> > _GLIBCXX_USE_CXX11_ABI == 1 then I am hiding a big part of the
> > basic_string definition. Initially it was to avoid to have to include
> > basic_string.tcc but it is also a lot of useless code indeed.
> >
> >
> > >
> > >> There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are
> > >> unrelated with my changes. I'll propose fixes in coming days.
> > > Which tests? I run the entire testsuite with
> > > -D_GLIBCXX_USE_CXX11_ABI=0 several times per day and I'm not seeing
> > > failures.
> > >
> > > I'll review the patch ASAP, thanks for working on it.
> > >
> > So far the only issue I found are in the mode !_GLIBCXX_USE_DUAL_ABI &&
> > !_GLIBCXX_USE_CXX11_ABI. They are:
> >
> > 23_containers/unordered_map/96088.cc
> > 23_containers/unordered_multimap/96088.cc
> > 23_containers/unordered_multiset/96088.cc
> > 23_containers/unordered_set/96088.cc
> > ext/debug_allocator/check_new.cc
> > ext/malloc_allocator/check_new.cc
> > ext/malloc_allocator/deallocate_local.cc
> > ext/new_allocator/deallocate_local.cc
> > ext/pool_allocator/allocate_chunk.cc
> > ext/throw_allocator/deallocate_local.cc
>
> Ah yes, they fail for !USE_DUAL_ABI builds, I wonder why.
>
> /home/test/src/gcc/libstdc++-v3/testsuite/23_containers/unordered_map/96088.
> cc:44: void test01(): Assertion '__gnu_test::counter::count() == 3' failed.
> FAIL: 23_containers/unordered_map/96088.cc execution test
It's due to this global object in src/c++20/tzdb.cc:
1081const string tzdata_file = "/tzdata.zi";
When the library uses COW strings that requires an allocation before
main, which uses the replacement operator new in the tests, which
fails to allocate. For example, in 22_locale/locale/cons/12352.cc we
have this function used by operator new:
int times_to_fail = 0;
void* allocate(std::size_t n)
{
if (!times_to_fail--)
return 0;
The counter is initially zero, so if we try to allocate before it gets
set to a non-zero value in test01() then we fail.
The test should not assume no allocations before main() begins. The
simplest way to do that is with another global that says "we have
started testing" e.g.
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
@@ -26,11 +26,12 @@
#include
#include
+bool tests_started = false;
int times_to_fail = 0;
void* allocate(std::size_t n)
{
- if (!times_to_fail--)
+ if (tests_started && !times_to_fail--)
return 0;
void* ret = std::malloc(n ? n : 1);
@@ -106,6 +107,8 @@ void operator delete[](void* p, const
std::nothrow_t&) throw()
// libstdc++/12352
void test01(int iters)
{
+ tests_started = true;
+
for (int j = 0; j < iters; ++j)
{
for (int i = 0; i < 100; ++i)
This way the replacement operator new doesn't start intentionally
failing until we ask it to do so.
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On Thu, 17 Aug 2023 at 18:40, François Dumont wrote: > > > On 17/08/2023 19:22, Jonathan Wakely wrote: > > On Sun, 13 Aug 2023 at 14:27, François Dumont via Libstdc++ > > wrote: > >> Here is the fixed patch tested in all 3 modes: > >> > >> - _GLIBCXX_USE_DUAL_ABI > >> > >> - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI > >> > >> - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI > >> > >> I don't know what you have in mind for the change below but I wanted to > >> let you know that I tried to put COW std::basic_string into a nested > >> __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on > >> string-inst.cc so I preferred the macro substitution approach. > > I was thinking of implementing the necessary special members functions > > of __cow_string directly, so they are ABI compatible with the COW > > std::basic_string but don't actually reuse the code. That would mean > > we don't need to compile and instantiate the whole COW string just to > > use a few members from it. But that can be done later, the macro > > approach seems OK for now. > > You'll see that when cow_string.h is included while > _GLIBCXX_USE_CXX11_ABI == 1 then I am hiding a big part of the > basic_string definition. Initially it was to avoid to have to include > basic_string.tcc but it is also a lot of useless code indeed. > > > > > >> There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are > >> unrelated with my changes. I'll propose fixes in coming days. > > Which tests? I run the entire testsuite with > > -D_GLIBCXX_USE_CXX11_ABI=0 several times per day and I'm not seeing > > failures. > > > > I'll review the patch ASAP, thanks for working on it. > > > So far the only issue I found are in the mode !_GLIBCXX_USE_DUAL_ABI && > !_GLIBCXX_USE_CXX11_ABI. They are: > > 23_containers/unordered_map/96088.cc > 23_containers/unordered_multimap/96088.cc > 23_containers/unordered_multiset/96088.cc > 23_containers/unordered_set/96088.cc > ext/debug_allocator/check_new.cc > ext/malloc_allocator/check_new.cc > ext/malloc_allocator/deallocate_local.cc > ext/new_allocator/deallocate_local.cc > ext/pool_allocator/allocate_chunk.cc > ext/throw_allocator/deallocate_local.cc Ah yes, they fail for !USE_DUAL_ABI builds, I wonder why. /home/test/src/gcc/libstdc++-v3/testsuite/23_containers/unordered_map/96088. cc:44: void test01(): Assertion '__gnu_test::counter::count() == 3' failed. FAIL: 23_containers/unordered_map/96088.cc execution test > but not sure I'll try to fix those in this context. Right, those seem like something separate. > > François >
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On 17/08/2023 19:22, Jonathan Wakely wrote: On Sun, 13 Aug 2023 at 14:27, François Dumont via Libstdc++ wrote: Here is the fixed patch tested in all 3 modes: - _GLIBCXX_USE_DUAL_ABI - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI I don't know what you have in mind for the change below but I wanted to let you know that I tried to put COW std::basic_string into a nested __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on string-inst.cc so I preferred the macro substitution approach. I was thinking of implementing the necessary special members functions of __cow_string directly, so they are ABI compatible with the COW std::basic_string but don't actually reuse the code. That would mean we don't need to compile and instantiate the whole COW string just to use a few members from it. But that can be done later, the macro approach seems OK for now. You'll see that when cow_string.h is included while _GLIBCXX_USE_CXX11_ABI == 1 then I am hiding a big part of the basic_string definition. Initially it was to avoid to have to include basic_string.tcc but it is also a lot of useless code indeed. There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are unrelated with my changes. I'll propose fixes in coming days. Which tests? I run the entire testsuite with -D_GLIBCXX_USE_CXX11_ABI=0 several times per day and I'm not seeing failures. I'll review the patch ASAP, thanks for working on it. So far the only issue I found are in the mode !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI. They are: 23_containers/unordered_map/96088.cc 23_containers/unordered_multimap/96088.cc 23_containers/unordered_multiset/96088.cc 23_containers/unordered_set/96088.cc ext/debug_allocator/check_new.cc ext/malloc_allocator/check_new.cc ext/malloc_allocator/deallocate_local.cc ext/new_allocator/deallocate_local.cc ext/pool_allocator/allocate_chunk.cc ext/throw_allocator/deallocate_local.cc but not sure I'll try to fix those in this context. François
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On Sun, 13 Aug 2023 at 14:27, François Dumont via Libstdc++ wrote: > > Here is the fixed patch tested in all 3 modes: > > - _GLIBCXX_USE_DUAL_ABI > > - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI > > - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI > > I don't know what you have in mind for the change below but I wanted to > let you know that I tried to put COW std::basic_string into a nested > __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on > string-inst.cc so I preferred the macro substitution approach. I was thinking of implementing the necessary special members functions of __cow_string directly, so they are ABI compatible with the COW std::basic_string but don't actually reuse the code. That would mean we don't need to compile and instantiate the whole COW string just to use a few members from it. But that can be done later, the macro approach seems OK for now. > > There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are > unrelated with my changes. I'll propose fixes in coming days. Which tests? I run the entire testsuite with -D_GLIBCXX_USE_CXX11_ABI=0 several times per day and I'm not seeing failures. I'll review the patch ASAP, thanks for working on it.
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
Another fix to define __cow_string(const std::string&) in cxx11-stdexcept.cc even if ! _GLIBCXX_USE_DUAL_ABI. On 13/08/2023 21:51, François Dumont wrote: Here is another version with enhanced sizeof/alignof static_assert in string-inst.cc for the std::__cow_string definition from . The assertions in cow-stdexcept.cc are now checking the definition which is in the same file. On 13/08/2023 15:27, François Dumont wrote: Here is the fixed patch tested in all 3 modes: - _GLIBCXX_USE_DUAL_ABI - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI I don't know what you have in mind for the change below but I wanted to let you know that I tried to put COW std::basic_string into a nested __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on string-inst.cc so I preferred the macro substitution approach. There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are unrelated with my changes. I'll propose fixes in coming days. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. To do support a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and _GLIBCXX_USE_CXX11_ABI. The main change is that std::__cow_string is now defined whenever _GLIBCXX_USE_DUAL_ABI or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available std::string in case of dual abi and a subset of it when it's not. On the other side std::__sso_string is defined only when _GLIBCXX_USE_DUAL_ABI is true and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a typedef for the cow std::string implementation when dual abi is disabled and cow string is being used. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. Move static_assert to check std::_cow_string abi layout to... * src/c++11/string-inst.cc: ...here. (_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS): Define following _GLIBCXX_USE_CXX11_ABI value. [_GLIBCXX_USE_CXX11_ABI && !_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS]: Define _GLIBCXX_DEFINING_COW_STRING_INSTANTIATIONS. Include . Define basic_string as __std_cow_string for the
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
Here is another version with enhanced sizeof/alignof static_assert in string-inst.cc for the std::__cow_string definition from . The assertions in cow-stdexcept.cc are now checking the definition which is in the same file. On 13/08/2023 15:27, François Dumont wrote: Here is the fixed patch tested in all 3 modes: - _GLIBCXX_USE_DUAL_ABI - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI I don't know what you have in mind for the change below but I wanted to let you know that I tried to put COW std::basic_string into a nested __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on string-inst.cc so I preferred the macro substitution approach. There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are unrelated with my changes. I'll propose fixes in coming days. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. To do support a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and _GLIBCXX_USE_CXX11_ABI. The main change is that std::__cow_string is now defined whenever _GLIBCXX_USE_DUAL_ABI or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available std::string in case of dual abi and a subset of it when it's not. On the other side std::__sso_string is defined only when _GLIBCXX_USE_DUAL_ABI is true and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a typedef for the cow std::string implementation when dual abi is disabled and cow string is being used. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. Move static_assert to check std::_cow_string abi layout to... * src/c++11/string-inst.cc: ...here. (_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS): Define following _GLIBCXX_USE_CXX11_ABI value. [_GLIBCXX_USE_CXX11_ABI && !_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS]: Define _GLIBCXX_DEFINING_COW_STRING_INSTANTIATIONS. Include . Define basic_string as __std_cow_string for the current translation unit. * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. *
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
Here is the fixed patch tested in all 3 modes: - _GLIBCXX_USE_DUAL_ABI - !_GLIBCXX_USE_DUAL_ABI && !_GLIBCXX_USE_CXX11_ABI - !_GLIBCXX_USE_DUAL_ABI && _GLIBCXX_USE_CXX11_ABI I don't know what you have in mind for the change below but I wanted to let you know that I tried to put COW std::basic_string into a nested __cow namespace when _GLIBCXX_USE_CXX11_ABI. But it had more impact on string-inst.cc so I preferred the macro substitution approach. There are some test failing when !_GLIBCXX_USE_CXX11_ABI that are unrelated with my changes. I'll propose fixes in coming days. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. To do support a new configuration mode where !_GLIBCXX_USE_DUAL_ABI and _GLIBCXX_USE_CXX11_ABI. The main change is that std::__cow_string is now defined whenever _GLIBCXX_USE_DUAL_ABI or _GLIBCXX_USE_CXX11_ABI is true. Implementation is using available std::string in case of dual abi and a subset of it when it's not. On the other side std::__sso_string is defined only when _GLIBCXX_USE_DUAL_ABI is true and _GLIBCXX_USE_CXX11_ABI is false. Meaning that std::__sso_string is a typedef for the cow std::string implementation when dual abi is disabled and cow string is being used. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. Move static_assert to check std::_cow_string abi layout to... * src/c++11/string-inst.cc: ...here. (_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS): Define following _GLIBCXX_USE_CXX11_ABI value. [_GLIBCXX_USE_CXX11_ABI && !_GLIBCXX_DEFINING_CXX11_ABI_INSTANTIATIONS]: Define _GLIBCXX_DEFINING_COW_STRING_INSTANTIATIONS. Include . Define basic_string as __std_cow_string for the current translation unit. * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-string-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. *
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
On Fri, 11 Aug 2023, 06:44 François Dumont via Libstdc++, < libstd...@gcc.gnu.org> wrote: > I hadn't tested the most basic default configuration and it is failing, I did wonder about that when you said which configurations you had tested :) > I need some more time yet. > OK, no problem. I actually have an idea for replacing the __cow_string hack with something better, which I will try to work on next week. That might make things simpler for you, as you won't need the __std_cow_string macro. > François > > > On 10/08/2023 07:13, François Dumont wrote: > > Hi > > > > I've eventually completed this work. > > > > This evolution will allow to build libstdc++ without dual abi and > > using cxx11 abi. For the moment such a config is only accessible > > through the --enable-symvers=gnu-versioned-namespace configuration. > > > > libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] > > > > Use cxx11 abi when activating versioned namespace mode. > > > > libstdcxx-v3/ChangeLog: > > > > PR libstdc++/83077 > > * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: > > Default to "new" libstdcxx abi. > > * config/locale/dragonfly/monetary_members.cc > > [!_GLIBCXX_USE_DUAL_ABI]: Define money_base > > members. > > * config/locale/generic/monetary_members.cc > > [!_GLIBCXX_USE_DUAL_ABI]: Likewise. > > * config/locale/gnu/monetary_members.cc > > [!_GLIBCXX_USE_DUAL_ABI]: Likewise. > > * config/locale/gnu/numeric_members.cc > > [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. > > * configure: Regenerate. > > * include/bits/c++config > > [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, > > _GLIBCXX_BEGIN_NAMESPACE_CXX11): > > Define empty. > > [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, > > _GLIBCXX_DEFAULT_ABI_TAG): > > Likewise. > > * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: > > Define a light version of COW > > basic_string as __std_cow_string for use in stdexcept. > > * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define > > __cow_string. > > (__cow_string(const char*)): New. > > (__cow_string::c_str()): New. > > * python/libstdcxx/v6/printers.py > > (StdStringPrinter::__init__): Set self.new_string to True > > when std::__8::basic_string type is found. > > * src/Makefile.am > > [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. > > * src/Makefile.in: Regenerate. > > * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... > > (dual_abi_sources): ...this. Also move cow-local_init.cc, > > cxx11-hash_tr1.cc, > > cxx11-ios_failure.cc entries to... > > (sources): ...this. > > (extra_string_inst_sources): Move cow-fstream-inst.cc, > > cow-sstream-inst.cc, cow-string-inst.cc, > > cow-string-io-inst.cc, cow-wtring-inst.cc, > > cow-wstring-io-inst.cc, cxx11-locale-inst.cc, > > cxx11-wlocale-inst.cc entries to... > > (inst_sources): ...this. > > * src/c++11/Makefile.in: Regenerate. > > * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: > > Skip definitions. > > * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: > > Skip definitions. > > * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: > > Skip definitions. > > * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: > > Include . > > [_GLIBCXX_USE_DUAL_ABI || > > _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including > > . Define > > _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition > > in is skipped. > > [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS > > definitions. > > * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: > > Skip definitions. > > * src/c++11/cow-string-io-inst.cc > > [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. > > * src/c++11/cow-wstring-inst.cc [_GLIBCXX_USE_CXX11_ABI]: > > Skip definitions. > > * src/c++11/cow-wstring-io-inst.cc > > [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. > > * src/c++11/cxx11-hash_tr1.cc [!_GLIBCXX_USE_CXX11_ABI]: > > Skip definitions. > > * src/c++11/cxx11-ios_failure.cc > > [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. > > [!_GLIBCXX_USE_DUAL_ABI] (__ios_failure): Remove. > > * src/c++11/cxx11-locale-inst.cc: Cleanup, just include > > locale-inst.cc. > > * src/c++11/cxx11-stdexcept.cc [!_GLIBCXX_USE_CXX11_ABI]: > > Skip definitions. > > * src/c++11/cxx11-wlocale-inst.cc > > [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. > > * src/c++11/locale-inst-numeric.h > >
Re: [PATCH] sso-string@gnu-versioned-namespace [PR83077]
I hadn't tested the most basic default configuration and it is failing, I need some more time yet. François On 10/08/2023 07:13, François Dumont wrote: Hi I've eventually completed this work. This evolution will allow to build libstdc++ without dual abi and using cxx11 abi. For the moment such a config is only accessible through the --enable-symvers=gnu-versioned-namespace configuration. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-string-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-hash_tr1.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-ios_failure.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. [!_GLIBCXX_USE_DUAL_ABI] (__ios_failure): Remove. * src/c++11/cxx11-locale-inst.cc: Cleanup, just include locale-inst.cc. * src/c++11/cxx11-stdexcept.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-wlocale-inst.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/locale-inst-numeric.h [!_GLIBCXX_USE_DUAL_ABI](std::use_facet>, std::use_facet>): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](std::has_facet>, std::has_facet>): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](std::num_getistreambuf_iterator>): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](std::num_putostreambuf_iterator>): Instantiate. * src/c++11/locale-inst.cc [!_GLIBCXX_USE_DUAL_ABI]: Build only when configured _GLIBCXX_USE_CXX11_ABI is equal to currently built abi. [!_GLIBCXX_USE_DUAL_ABI](__moneypunct_cache): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](__moneypunct_cache): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](__numpunct_cache): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](__timepunct): Instantiate.
[PATCH] sso-string@gnu-versioned-namespace [PR83077]
Hi I've eventually completed this work. This evolution will allow to build libstdc++ without dual abi and using cxx11 abi. For the moment such a config is only accessible through the --enable-symvers=gnu-versioned-namespace configuration. libstdc++: [_GLIBCXX_INLINE_VERSION] Use cxx11 abi [PR83077] Use cxx11 abi when activating versioned namespace mode. libstdcxx-v3/ChangeLog: PR libstdc++/83077 * acinclude.m4 [GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI]: Default to "new" libstdcxx abi. * config/locale/dragonfly/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Define money_base members. * config/locale/generic/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/monetary_members.cc [!_GLIBCXX_USE_DUAL_ABI]: Likewise. * config/locale/gnu/numeric_members.cc [!_GLIBCXX_USE_DUAL_ABI](__narrow_multibyte_chars): Define. * configure: Regenerate. * include/bits/c++config [_GLIBCXX_INLINE_VERSION](_GLIBCXX_NAMESPACE_CXX11, _GLIBCXX_BEGIN_NAMESPACE_CXX11): Define empty. [_GLIBCXX_INLINE_VERSION](_GLIBCXX_END_NAMESPACE_CXX11, _GLIBCXX_DEFAULT_ABI_TAG): Likewise. * include/bits/cow_string.h [!_GLIBCXX_USE_CXX11_ABI]: Define a light version of COW basic_string as __std_cow_string for use in stdexcept. * include/std/stdexcept [_GLIBCXX_USE_CXX11_ABI]: Define __cow_string. (__cow_string(const char*)): New. (__cow_string::c_str()): New. * python/libstdcxx/v6/printers.py (StdStringPrinter::__init__): Set self.new_string to True when std::__8::basic_string type is found. * src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE](ldbl_alt128_compat_sources): Define empty. * src/Makefile.in: Regenerate. * src/c++11/Makefile.am (cxx11_abi_sources): Rename into... (dual_abi_sources): ...this. Also move cow-local_init.cc, cxx11-hash_tr1.cc, cxx11-ios_failure.cc entries to... (sources): ...this. (extra_string_inst_sources): Move cow-fstream-inst.cc, cow-sstream-inst.cc, cow-string-inst.cc, cow-string-io-inst.cc, cow-wtring-inst.cc, cow-wstring-io-inst.cc, cxx11-locale-inst.cc, cxx11-wlocale-inst.cc entries to... (inst_sources): ...this. * src/c++11/Makefile.in: Regenerate. * src/c++11/cow-fstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-locale_init.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-sstream-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-stdexcept.cc [_GLIBCXX_USE_CXX11_ABI]: Include . [_GLIBCXX_USE_DUAL_ABI || _GLIBCXX_USE_CXX11_ABI](__cow_string): Redefine before including . Define _GLIBCXX_DEFINE_STDEXCEPT_INSTANTIATIONS so that __cow_string definition in is skipped. [_GLIBCXX_USE_CXX11_ABI]: Skip Transaction Memory TS definitions. * src/c++11/cow-string-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-string-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cow-wstring-io-inst.cc [_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-hash_tr1.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-ios_failure.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. [!_GLIBCXX_USE_DUAL_ABI] (__ios_failure): Remove. * src/c++11/cxx11-locale-inst.cc: Cleanup, just include locale-inst.cc. * src/c++11/cxx11-stdexcept.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/cxx11-wlocale-inst.cc [!_GLIBCXX_USE_CXX11_ABI]: Skip definitions. * src/c++11/locale-inst-numeric.h [!_GLIBCXX_USE_DUAL_ABI](std::use_facet>, std::use_facet>): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](std::has_facet>, std::has_facet>): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](std::num_getistreambuf_iterator>): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](std::num_putostreambuf_iterator>): Instantiate. * src/c++11/locale-inst.cc [!_GLIBCXX_USE_DUAL_ABI]: Build only when configured _GLIBCXX_USE_CXX11_ABI is equal to currently built abi. [!_GLIBCXX_USE_DUAL_ABI](__moneypunct_cache): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](__moneypunct_cache): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](__numpunct_cache): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](__timepunct): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](__timepunct_cache): Instantiate. [!_GLIBCXX_USE_DUAL_ABI](time_putostreambuf_iterator>): Instantiate.
