Patchwork fix libstdc++/52604 : __freelist::~__freelist re-initializes _M_thread_freelist

login
register
mail settings
Submitter Laurent Alfonsi
Date April 19, 2012, 8:37 a.m.
Message ID <4F8FCEAE.8040709@st.com>
Download mbox | patch
Permalink /patch/153686/
State New
Headers show

Comments

Laurent Alfonsi - April 19, 2012, 8:37 a.m.
All,

The attached patch re-initializes _M_thread_freelist in 
__freelist::~__freelist just after calling
   ::operator delete(static_cast<void*>(_M_thread_freelist_array));

It avoids valgrind errors in __pool<true>::_M_get_thread_id() later invoked.

Testcases :
   ext/mt_allocator/deallocate_global_thread-1.cc
   ext/mt_allocator/deallocate_global_thread-3.cc

Tested on x86_64-linux (make check, make check-performance).

Laurent

PS : Already approved by Paolo Carlini under the 52604 discussions.
Laurent Alfonsi - April 19, 2012, 8:39 a.m.
Also, here is the Changelog :

2012-04-13  Laurent Alfonsi <laurent.alfonsi@st.com>

         PR libstdc++/52604
         * src/mt_allocator.cc: (__freelist::~__freelist): Reset pointer.

Patch

Index: src/c++98/mt_allocator.cc
===================================================================
--- src/c++98/mt_allocator.cc    (revision 186374)
+++ src/c++98/mt_allocator.cc    (working copy)
@@ -48,6 +48,7 @@ 
     {
       __gthread_key_delete(_M_key);
       ::operator delete(static_cast<void*>(_M_thread_freelist_array));
+      _M_thread_freelist = 0;
     }
     }
   };