From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id B28AD3858C52; Thu, 2 Feb 2023 17:20:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B28AD3858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675358437; bh=PolcpRIb64xQrgE+C49Wf2AHUi7Z0u+8JjMfYizfEDQ=; h=From:To:Subject:Date:From; b=Oia1AT9bIaT9qJH0duGhZdj8tGJhRYX6PRvFi2J/vYxpTD6u0Ndp4zApBbX194rUd WoZEQJAbF4XD2qn/9q+rFak7MNKRsskkGGZ526ZPw9wKO9yTfUNmw6jaJ3wtoCbvgU lqaro4H1R0Lzyvsh/A1nrBntL4MamP75uCziRNQs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5663] libstdc++: Define std::basic_stringbuf::view() for old std::string ABI X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: db8d6fc572ec316ccfcf70b1dffe3be0b1b37212 X-Git-Newrev: 331b4f168a06cd85fe40fd03b48b128cc8af399c Message-Id: <20230202172037.B28AD3858C52@sourceware.org> Date: Thu, 2 Feb 2023 17:20:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:331b4f168a06cd85fe40fd03b48b128cc8af399c commit r13-5663-g331b4f168a06cd85fe40fd03b48b128cc8af399c Author: Jonathan Wakely Date: Tue Jan 31 22:32:15 2023 +0000 libstdc++: Define std::basic_stringbuf::view() for old std::string ABI Unlike the new str()&& members in , there is no real difficulty in supporting the new view() members for the old std::string ABI. Enabling it fixes errors in where std::ostringstream::view() is used by ostream insertion operators for calendar types. We just need to use [[gnu::always_inline]] on the view() members for the old ABI, because the library doesn't contain instantiations of them for the old ABI. Making them always inline avoids needing to add those instantiations and export them. libstdc++-v3/ChangeLog: * include/std/sstream (basic_stringbuf::view): Define for old std::string ABI. (basic_istringstream::view, basic_0stringstream::view) (basic_stringstream::view): Likewise. * testsuite/27_io/basic_istringstream/view/char/1.cc: Remove { dg-require-effective-target cxx11_abi }. * testsuite/27_io/basic_istringstream/view/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/view/char/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_stringbuf/view/char/1.cc: Likewise. * testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_stringstream/view/char/1.cc: Likewise. * testsuite/27_io/basic_stringstream/view/wchar_t/1.cc: Likewise. Diff: --- libstdc++-v3/include/std/sstream | 32 +++++++++++++++++----- .../27_io/basic_istringstream/view/char/1.cc | 1 - .../27_io/basic_istringstream/view/wchar_t/1.cc | 1 - .../27_io/basic_ostringstream/view/char/1.cc | 1 - .../27_io/basic_ostringstream/view/wchar_t/1.cc | 1 - .../testsuite/27_io/basic_stringbuf/view/char/1.cc | 1 - .../27_io/basic_stringbuf/view/wchar_t/1.cc | 1 - .../27_io/basic_stringstream/view/char/1.cc | 1 - .../27_io/basic_stringstream/view/wchar_t/1.cc | 1 - 9 files changed, 25 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream index 4f0c50fcc8a..6b3139714c7 100644 --- a/libstdc++-v3/include/std/sstream +++ b/libstdc++-v3/include/std/sstream @@ -43,10 +43,15 @@ #if __cplusplus > 201703L && _GLIBCXX_USE_CXX11_ABI # define _GLIBCXX_LVAL_REF_QUAL & +# define _GLIBCXX_SSTREAM_ALWAYS_INLINE #else # define _GLIBCXX_LVAL_REF_QUAL +// For symbols that are not exported from libstdc++.so for the COW string ABI. +# define _GLIBCXX_SSTREAM_ALWAYS_INLINE [[__gnu__::__always_inline__]] #endif + + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -251,7 +256,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 return __ret; } -#if __cplusplus > 201703L && _GLIBCXX_USE_CXX11_ABI +#if __cplusplus > 201703L +#if _GLIBCXX_USE_CXX11_ABI #if __cpp_concepts template<__allocator_like _SAlloc> basic_string<_CharT, _Traits, _SAlloc> @@ -275,7 +281,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _M_sync(_M_string.data(), 0, 0); return __str; } +#endif // cxx11 ABI + _GLIBCXX_SSTREAM_ALWAYS_INLINE basic_string_view view() const noexcept { @@ -698,7 +706,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 str() const _GLIBCXX_LVAL_REF_QUAL { return _M_stringbuf.str(); } -#if __cplusplus > 201703L && _GLIBCXX_USE_CXX11_ABI +#if __cplusplus > 201703L +#if _GLIBCXX_USE_CXX11_ABI #if __cpp_concepts template<__allocator_like _SAlloc> basic_string<_CharT, _Traits, _SAlloc> @@ -709,11 +718,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 __string_type str() && { return std::move(_M_stringbuf).str(); } +#endif // cxx11 ABI + _GLIBCXX_SSTREAM_ALWAYS_INLINE basic_string_view view() const noexcept { return _M_stringbuf.view(); } -#endif +#endif // C++20 /** * @brief Setting a new buffer. @@ -919,7 +930,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 str() const _GLIBCXX_LVAL_REF_QUAL { return _M_stringbuf.str(); } -#if __cplusplus > 201703L && _GLIBCXX_USE_CXX11_ABI +#if __cplusplus > 201703L +#if _GLIBCXX_USE_CXX11_ABI #if __cpp_concepts template<__allocator_like _SAlloc> basic_string<_CharT, _Traits, _SAlloc> @@ -930,11 +942,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 __string_type str() && { return std::move(_M_stringbuf).str(); } +#endif // cxx11 ABI + _GLIBCXX_SSTREAM_ALWAYS_INLINE basic_string_view view() const noexcept { return _M_stringbuf.view(); } -#endif +#endif // C++20 /** * @brief Setting a new buffer. @@ -1138,7 +1152,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 str() const _GLIBCXX_LVAL_REF_QUAL { return _M_stringbuf.str(); } -#if __cplusplus > 201703L && _GLIBCXX_USE_CXX11_ABI +#if __cplusplus > 201703L +#if _GLIBCXX_USE_CXX11_ABI #if __cpp_concepts template<__allocator_like _SAlloc> basic_string<_CharT, _Traits, _SAlloc> @@ -1149,11 +1164,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 __string_type str() && { return std::move(_M_stringbuf).str(); } +#endif // cxx11 ABI + _GLIBCXX_SSTREAM_ALWAYS_INLINE basic_string_view view() const noexcept { return _M_stringbuf.view(); } -#endif +#endif // C++20 /** * @brief Setting a new buffer. @@ -1215,6 +1232,7 @@ _GLIBCXX_END_NAMESPACE_CXX11 _GLIBCXX_END_NAMESPACE_VERSION } // namespace +#undef _GLIBCXX_SSTREAM_ALWAYS_INLINE #undef _GLIBCXX_LVAL_REF_QUAL #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc index 5309c448be2..04aae817569 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/char/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc index 774bef10fc5..06b04b3c6b9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/view/wchar_t/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc index 320086153ff..41279083a06 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/char/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc index 1b9b851eb25..2f177d45d70 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/view/wchar_t/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc index 998ad5c3e2b..138f4b124e5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/char/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc index 58334084dc1..30b8f0549f4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/view/wchar_t/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc index bd14bc58293..91d329dfa86 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/char/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc index d179f4e2201..7af53dcd16f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/view/wchar_t/1.cc @@ -19,7 +19,6 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } -// { dg-require-effective-target cxx11_abi } #include #include