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

Message ID 20191009125516.GA12729@redhat.com
State New
Headers show
Series
  • PR libstdc++/78552 only construct std::locale for C locale once
Related show

Commit Message

Jonathan Wakely Oct. 9, 2019, 12:55 p.m. UTC
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.

Tested x86_64-linux, committed to trunk.

This should be safe to backport too, but I'll wait a while as usual.
commit 8551ad37ed959266b5aaeab5c29ddfe26e121060
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Jul 2 15:31:48 2019 +0100

    PR libstdc++/78552 only construct std::locale for C locale once
    
            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.

Patch
diff mbox series

diff --git a/libstdc++-v3/src/c++98/locale_init.cc b/libstdc++-v3/src/c++98/locale_init.cc
index e5e9d74379f..07d95dc09fd 100644
--- 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