PR libstdc++/78552 only construct std::locale for C locale once

Backport from mainline
2019-10-09  Jonathan Wakely  <jwakely@redhat.com>

	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 --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60f21017664126bed243d792e8bcb83faff79940..19ae4cef9fa59266441eca335dcbad930bac1401 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2020-02-26  Jonathan Wakely  <jwakely@redhat.com>
+
+       Backport from mainline
+       2019-10-09  Jonathan Wakely  <jwakely@redhat.com>
+
+       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.
+
 2020-01-24  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/src/c++98/locale_init.cc b/libstdc++-v3/src/c++98/locale_init.cc
index e5e9d74379f5c34ca829b7667b553335abbd2952..07d95dc09fd8d245d2b08429621558bcee59f857 100644 (file)
--- a/libstdc++-v3/src/c++98/locale_init.cc
+++ b/libstdc++-v3/src/c++98/locale_init.cc
@@ -303,7 +303,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   locale::classic()
   {
     _S_initialize();
-    return *(new (&c_locale) locale(_S_classic));
+    return *(const locale*)c_locale;
   }
 
   void
@@ -313,6 +313,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