From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 82D08398B86D; Thu, 17 Sep 2020 16:48:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82D08398B86D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600361280; bh=eGrpswKroJaoczaclzxDFyeCe46zLjDCpoM/nIvFTac=; h=From:To:Subject:Date:From; b=jty62SQ60T6TVE/XxT4uZHqQKA0K2Fp8cf/g9CHbf03266EQhxyanT1mIXvXpXsfm FHbCwMBC98tYdJYwOJr8s7+A7/sdS8OVe0TXuydgRH/4cOlxG6JSP0/dbte+Jvwf83 3/OMAg3x0hjy4vK0wTE+f5GGIq/Qq1C46oZ8QD6A= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] PR libstdc++/78552 only construct std::locale for C locale once X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: 38d8d02eb9ce431f0746a3a0606b89da8c18f133 X-Git-Newrev: d6c8aad430338fdc4017918a9e520949a4a01d9e Message-Id: <20200917164800.82D08398B86D@sourceware.org> Date: Thu, 17 Sep 2020 16:48:00 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 16:48:00 -0000 https://gcc.gnu.org/g:d6c8aad430338fdc4017918a9e520949a4a01d9e commit d6c8aad430338fdc4017918a9e520949a4a01d9e Author: Jonathan Wakely Date: Wed Feb 26 09:43:59 2020 +0000 PR libstdc++/78552 only construct std::locale for C locale once Backport from mainline 2019-10-09 Jonathan Wakely PR libstdc++/78552 * src/c++98/locale_init.cc (locale::classic()): Do not construct a new locale object for every call. (locale::_S_initialize_once()): Construct C locale here. Diff: --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/src/c++98/locale_init.cc | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ab768b957c4..8b4637246b9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2020-02-26 Jonathan Wakely + Backport from mainline + 2019-10-09 Jonathan Wakely + + PR libstdc++/78552 + * src/c++98/locale_init.cc (locale::classic()): Do not construct a new + locale object for every call. + (locale::_S_initialize_once()): Construct C locale here. + Backport from mainline 2020-01-23 Jonathan Wakely diff --git a/libstdc++-v3/src/c++98/locale_init.cc b/libstdc++-v3/src/c++98/locale_init.cc index fb3d8ab972a..3ee4da3d9ad 100644 --- a/libstdc++-v3/src/c++98/locale_init.cc +++ b/libstdc++-v3/src/c++98/locale_init.cc @@ -296,7 +296,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION locale::classic() { _S_initialize(); - return *(new (&c_locale) locale(_S_classic)); + return *(const locale*)c_locale; } void @@ -306,6 +306,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // One reference for _S_classic, one for _S_global _S_classic = new (&c_locale_impl) _Impl(2); _S_global = _S_classic; + new (&c_locale) locale(_S_classic); } void