From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 44A02385841A; Wed, 24 Aug 2022 22:51:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 44A02385841A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661381509; bh=i3YF6doRfUY1IffVxolsY/HyZwiTHiH28KJB/hHENNo=; h=From:To:Subject:Date:From; b=yObTSy8+h/+Jw9tO6eKjod9uICqFL5vQ5dkRbpGUVyMLOMCub0ap1tsxnXs5pvcRh xGL0p2baYFVovMPCMZ3IdyzcIaDvgP3oxNBAr5O/x/FxONv4f3qxPjIYL9uuQU5Qf4 RBKu+GIvS9v3D2T9MCsDbZD+yKBvYT79AKq83Y9w= 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-2192] Revert "libstdc++: Optimize operator+(string/char*, char*/string) equally" X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f46f58e61db3b1e71beb21443c0ca9387bc836e2 X-Git-Newrev: e5428086c2c8daf69e5916dd5016d1e7b85d3f0d Message-Id: <20220824225149.44A02385841A@sourceware.org> Date: Wed, 24 Aug 2022 22:51:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e5428086c2c8daf69e5916dd5016d1e7b85d3f0d commit r13-2192-ge5428086c2c8daf69e5916dd5016d1e7b85d3f0d Author: Jonathan Wakely Date: Wed Aug 24 23:47:43 2022 +0100 Revert "libstdc++: Optimize operator+(string/char*, char*/string) equally" This reverts commit 0b7c9254998b3fb2c39f6b86b5b196f415530205. Diff: --- libstdc++-v3/include/bits/basic_string.h | 9 +++++++-- libstdc++-v3/include/bits/basic_string.tcc | 21 --------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index fa6738925bb..b04fba95678 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -3521,9 +3521,14 @@ _GLIBCXX_END_NAMESPACE_CXX11 */ template _GLIBCXX20_CONSTEXPR - basic_string<_CharT, _Traits, _Alloc> + inline basic_string<_CharT, _Traits, _Alloc> operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs, - const _CharT* __rhs); + const _CharT* __rhs) + { + basic_string<_CharT, _Traits, _Alloc> __str(__lhs); + __str.append(__rhs); + return __str; + } /** * @brief Concatenate string and character. diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 95ba8e503e9..4563c61429a 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -640,27 +640,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __str; } - template - _GLIBCXX20_CONSTEXPR - basic_string<_CharT, _Traits, _Alloc> - operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs, - const _CharT* __rhs) - { - __glibcxx_requires_string(__rhs); - typedef basic_string<_CharT, _Traits, _Alloc> __string_type; - typedef typename __string_type::size_type __size_type; - typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template - rebind<_CharT>::other _Char_alloc_type; - typedef __gnu_cxx::__alloc_traits<_Char_alloc_type> _Alloc_traits; - const __size_type __len = _Traits::length(__rhs); - __string_type __str(_Alloc_traits::_S_select_on_copy( - __lhs.get_allocator())); - __str.reserve(__len + __lhs.size()); - __str.append(__lhs); - __str.append(__rhs, __len); - return __str; - } - template _GLIBCXX_STRING_CONSTEXPR typename basic_string<_CharT, _Traits, _Alloc>::size_type