re PR libstdc++/54297 ([C++11] Segmentation fault with std::async and released shared state)
PR libstdc++/54297 * src/c++11/future.cc (~_Async_state_common): Move to... * src/c++11/compatibility-thread-c++0x.cc (~_Async_state_common): Here. (_GLIBCXX_ABI_COMPAT_ASYNC): Rename to _GLIBCXX_ASYNC_ABI_COMPAT. * include/std/future (_GLIBCXX_ABI_COMPAT_ASYNC): Likewise. From-SVN: r190685
This commit is contained in:
parent
14fbeb6cf1
commit
3dd808fe94
|
@ -1,3 +1,12 @@
|
||||||
|
2012-08-26 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
PR libstdc++/54297
|
||||||
|
* src/c++11/future.cc (~_Async_state_common): Move to...
|
||||||
|
* src/c++11/compatibility-thread-c++0x.cc (~_Async_state_common):
|
||||||
|
Here.
|
||||||
|
(_GLIBCXX_ABI_COMPAT_ASYNC): Rename to _GLIBCXX_ASYNC_ABI_COMPAT.
|
||||||
|
* include/std/future (_GLIBCXX_ABI_COMPAT_ASYNC): Likewise.
|
||||||
|
|
||||||
2012-08-26 Jonathan Wakely <jwakely.gcc@gmail.com>
|
2012-08-26 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
Geoff Romer <gromer@google.com>
|
Geoff Romer <gromer@google.com>
|
||||||
|
|
||||||
|
|
|
@ -1427,7 +1427,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
class __future_base::_Async_state_common : public __future_base::_State_base
|
class __future_base::_Async_state_common : public __future_base::_State_base
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
#if defined(_GLIBCXX_HAVE_TLS) && defined(_GLIBCXX_ABI_COMPAT_ASYNC)
|
#ifdef _GLIBCXX_ASYNC_ABI_COMPAT
|
||||||
~_Async_state_common();
|
~_Async_state_common();
|
||||||
#else
|
#else
|
||||||
~_Async_state_common() = default;
|
~_Async_state_common() = default;
|
||||||
|
|
|
@ -22,11 +22,16 @@
|
||||||
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
// <http://www.gnu.org/licenses/>.
|
// <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include <bits/c++config.h>
|
||||||
|
#if defined(_GLIBCXX_HAVE_TLS) && defined(PIC)
|
||||||
|
#define _GLIBCXX_ASYNC_ABI_COMPAT
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <future>
|
#include <future>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
#ifndef __GXX_EXPERIMENTAL_CXX0X__
|
#ifndef __GXX_EXPERIMENTAL_CXX0X__
|
||||||
# error "compatibility-c++0x.cc must be compiled with -std=gnu++0x"
|
# error "compatibility-thread-c++0x.cc must be compiled with -std=gnu++0x"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define _GLIBCXX_ASM_SYMVER(cur, old, version) \
|
#define _GLIBCXX_ASM_SYMVER(cur, old, version) \
|
||||||
|
@ -70,3 +75,23 @@ _GLIBCXX_ASM_SYMVER(_ZN9__gnu_cxx11try_to_lockE, _ZSt11try_to_lock, GLIBCXX_3.4.
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
|
#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
|
||||||
|
|
||||||
|
|
||||||
|
// XXX GLIBCXX_ABI Deprecated
|
||||||
|
// gcc-4.7.0
|
||||||
|
// <future> export changes
|
||||||
|
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
|
||||||
|
&& (ATOMIC_INT_LOCK_FREE > 1)
|
||||||
|
#if defined(_GLIBCXX_HAVE_TLS) && defined(PIC)
|
||||||
|
namespace std _GLIBCXX_VISIBILITY(default)
|
||||||
|
{
|
||||||
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
|
__future_base::_Async_state_common::~_Async_state_common() { _M_join(); }
|
||||||
|
|
||||||
|
// Explicit instantiation due to -fno-implicit-instantiation.
|
||||||
|
template void call_once(once_flag&, void (thread::*&&)(), reference_wrapper<thread>&&);
|
||||||
|
template _Bind_simple_helper<void (thread::*)(), reference_wrapper<thread>>::__type __bind_simple(void (thread::*&&)(), reference_wrapper<thread>&&);
|
||||||
|
_GLIBCXX_END_NAMESPACE_VERSION
|
||||||
|
} // namespace std
|
||||||
|
#endif
|
||||||
|
#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
// <http://www.gnu.org/licenses/>.
|
// <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#define _GLIBCXX_ABI_COMPAT_ASYNC
|
|
||||||
|
|
||||||
#include <future>
|
#include <future>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
|
@ -86,15 +84,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
__future_base::_Result_base::~_Result_base() = default;
|
__future_base::_Result_base::~_Result_base() = default;
|
||||||
|
|
||||||
__future_base::_State_base::~_State_base() = default;
|
__future_base::_State_base::~_State_base() = default;
|
||||||
|
|
||||||
#ifdef _GLIBCXX_HAVE_TLS
|
|
||||||
// Exported for compatibility with ABI version 3.4.17
|
|
||||||
__future_base::_Async_state_common::~_Async_state_common() { _M_join(); }
|
|
||||||
|
|
||||||
// Explicit instantiation due to -fno-implicit-instantiation.
|
|
||||||
template void call_once(once_flag&, void (thread::*&&)(), reference_wrapper<thread>&&);
|
|
||||||
template _Bind_simple_helper<void (thread::*)(), reference_wrapper<thread>>::__type __bind_simple(void (thread::*&&)(), reference_wrapper<thread>&&);
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
_GLIBCXX_END_NAMESPACE_VERSION
|
_GLIBCXX_END_NAMESPACE_VERSION
|
||||||
|
|
Loading…
Reference in New Issue