diff options
Diffstat (limited to 'libstdc++-v3/libsupc++/eh_ptr.cc')
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_ptr.cc | 58 |
1 files changed, 23 insertions, 35 deletions
diff --git a/libstdc++-v3/libsupc++/eh_ptr.cc b/libstdc++-v3/libsupc++/eh_ptr.cc index 3b8e0a01ed..12d8d70268 100644 --- a/libstdc++-v3/libsupc++/eh_ptr.cc +++ b/libstdc++-v3/libsupc++/eh_ptr.cc @@ -1,5 +1,5 @@ // -*- C++ -*- Implement the members of exception_ptr. -// Copyright (C) 2008-2016 Free Software Foundation, Inc. +// Copyright (C) 2008-2017 Free Software Foundation, Inc. // // This file is part of GCC. // @@ -23,9 +23,7 @@ // <http://www.gnu.org/licenses/>. #include <bits/c++config.h> -#include <bits/atomic_lockfree_defines.h> - -#if ATOMIC_INT_LOCK_FREE > 1 +#include "eh_atomics.h" #define _GLIBCXX_EH_PTR_COMPAT @@ -63,33 +61,31 @@ static_assert( adjptr<__cxa_exception>() #endif } -std::__exception_ptr::exception_ptr::exception_ptr() _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::exception_ptr() noexcept : _M_exception_object(0) { } -std::__exception_ptr::exception_ptr::exception_ptr(void* obj) -_GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::exception_ptr(void* obj) noexcept : _M_exception_object(obj) { _M_addref(); } -std::__exception_ptr::exception_ptr::exception_ptr(__safe_bool) -_GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::exception_ptr(__safe_bool) noexcept : _M_exception_object(0) { } std::__exception_ptr:: -exception_ptr::exception_ptr(const exception_ptr& other) _GLIBCXX_USE_NOEXCEPT +exception_ptr::exception_ptr(const exception_ptr& other) noexcept : _M_exception_object(other._M_exception_object) { _M_addref(); } -std::__exception_ptr::exception_ptr::~exception_ptr() _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::~exception_ptr() noexcept { _M_release(); } std::__exception_ptr::exception_ptr& std::__exception_ptr:: -exception_ptr::operator=(const exception_ptr& other) _GLIBCXX_USE_NOEXCEPT +exception_ptr::operator=(const exception_ptr& other) noexcept { exception_ptr(other).swap(*this); return *this; @@ -97,25 +93,25 @@ exception_ptr::operator=(const exception_ptr& other) _GLIBCXX_USE_NOEXCEPT void -std::__exception_ptr::exception_ptr::_M_addref() _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::_M_addref() noexcept { if (_M_exception_object) { __cxa_refcounted_exception *eh = __get_refcounted_exception_header_from_obj (_M_exception_object); - __atomic_add_fetch (&eh->referenceCount, 1, __ATOMIC_ACQ_REL); + __gnu_cxx::__eh_atomic_inc (&eh->referenceCount); } } void -std::__exception_ptr::exception_ptr::_M_release() _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::_M_release() noexcept { if (_M_exception_object) { __cxa_refcounted_exception *eh = __get_refcounted_exception_header_from_obj (_M_exception_object); - if (__atomic_sub_fetch (&eh->referenceCount, 1, __ATOMIC_ACQ_REL) == 0) + if (__gnu_cxx::__eh_atomic_dec (&eh->referenceCount)) { if (eh->exc.exceptionDestructor) eh->exc.exceptionDestructor (_M_exception_object); @@ -128,13 +124,12 @@ std::__exception_ptr::exception_ptr::_M_release() _GLIBCXX_USE_NOEXCEPT void* -std::__exception_ptr::exception_ptr::_M_get() const _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::_M_get() const noexcept { return _M_exception_object; } void -std::__exception_ptr::exception_ptr::swap(exception_ptr &other) - _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::swap(exception_ptr &other) noexcept { void *tmp = _M_exception_object; _M_exception_object = other._M_exception_object; @@ -144,27 +139,24 @@ std::__exception_ptr::exception_ptr::swap(exception_ptr &other) // Retained for compatibility with CXXABI_1.3. void -std::__exception_ptr::exception_ptr::_M_safe_bool_dummy() - _GLIBCXX_USE_NOEXCEPT { } +std::__exception_ptr::exception_ptr::_M_safe_bool_dummy() noexcept { } // Retained for compatibility with CXXABI_1.3. bool -std::__exception_ptr::exception_ptr::operator!() const _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::operator!() const noexcept { return _M_exception_object == 0; } // Retained for compatibility with CXXABI_1.3. -std::__exception_ptr::exception_ptr::operator __safe_bool() const -_GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::operator __safe_bool() const noexcept { return _M_exception_object ? &exception_ptr::_M_safe_bool_dummy : 0; } const std::type_info* -std::__exception_ptr::exception_ptr::__cxa_exception_type() const - _GLIBCXX_USE_NOEXCEPT +std::__exception_ptr::exception_ptr::__cxa_exception_type() const noexcept { __cxa_exception *eh = __get_exception_header_from_obj (_M_exception_object); return eh->exceptionType; @@ -172,19 +164,17 @@ std::__exception_ptr::exception_ptr::__cxa_exception_type() const bool std::__exception_ptr::operator==(const exception_ptr& lhs, - const exception_ptr& rhs) - _GLIBCXX_USE_NOEXCEPT + const exception_ptr& rhs) noexcept { return lhs._M_exception_object == rhs._M_exception_object; } bool std::__exception_ptr::operator!=(const exception_ptr& lhs, - const exception_ptr& rhs) - _GLIBCXX_USE_NOEXCEPT + const exception_ptr& rhs) noexcept { return !(lhs == rhs);} std::exception_ptr -std::current_exception() _GLIBCXX_USE_NOEXCEPT +std::current_exception() noexcept { __cxa_eh_globals *globals = __cxa_get_globals (); __cxa_exception *header = globals->caughtExceptions; @@ -219,7 +209,7 @@ __gxx_dependent_exception_cleanup(_Unwind_Reason_Code code, __cxa_free_dependent_exception (dep); - if (__atomic_sub_fetch (&header->referenceCount, 1, __ATOMIC_ACQ_REL) == 0) + if (__gnu_cxx::__eh_atomic_dec (&header->referenceCount)) { if (header->exc.exceptionDestructor) header->exc.exceptionDestructor (header + 1); @@ -238,7 +228,7 @@ std::rethrow_exception(std::exception_ptr ep) __cxa_dependent_exception *dep = __cxa_allocate_dependent_exception (); dep->primaryException = obj; - __atomic_add_fetch (&eh->referenceCount, 1, __ATOMIC_ACQ_REL); + __gnu_cxx::__eh_atomic_inc (&eh->referenceCount); dep->unexpectedHandler = get_unexpected (); dep->terminateHandler = get_terminate (); @@ -260,5 +250,3 @@ std::rethrow_exception(std::exception_ptr ep) } #undef _GLIBCXX_EH_PTR_COMPAT - -#endif |