Skip to content

R
riscv-gcc-1
Commit ec087ba3 by Nina Dinka Ranns Committed by Ville Voutilainen
Options

Adding noexcept-specification on tuple constructors (LWG 2899) 

2019-04-28 Nina Dinka Ranns <dinka.ranns@gmail.com>

* libstdc++-v3/include/std/tuple:
(tuple()): Add noexcept-specification.
(tuple(const _Elements&...)): Likewise
(tuple(_UElements&&...)): Likewise
(tuple(const tuple<_UElements...>&)): Likewise
(tuple(tuple<_UElements...>&&)): Likewise
(tuple(const _T1&, const _T2&)): Likewise
(tuple(_U1&&, _U2&&)): Likewise
(tuple(const tuple<_U1, _U2>&): Likewise
(tuple(tuple<_U1, _U2>&&): Likewise
(tuple(const pair<_U1, _U2>&): Likewise
(tuple(pair<_U1, _U2>&&): Likewise
* libstdc++-v3/testsuite/20_util/tuple/cons/noexcept_specs.cc: New

From-SVN: r270632
parent b9a5a80c
Showing with 56 additions and 0 deletions
libstdc++-v3/ChangeLog
2019-04-28 Nina Dinka Ranns <dinka.ranns@gmail.com>
Adding noexcept-specification on tuple constructors (LWG 2899)
* libstdc++-v3/include/std/tuple:
(tuple()): Add noexcept-specification.
(tuple(const _Elements&...)): Likewise
(tuple(_UElements&&...)): Likewise
(tuple(const tuple<_UElements...>&)): Likewise
(tuple(tuple<_UElements...>&&)): Likewise
(tuple(const _T1&, const _T2&)): Likewise
(tuple(_U1&&, _U2&&)): Likewise
(tuple(const tuple<_U1, _U2>&): Likewise
(tuple(tuple<_U1, _U2>&&): Likewise
(tuple(const pair<_U1, _U2>&): Likewise
(tuple(pair<_U1, _U2>&&): Likewise
* libstdc++-v3/testsuite/20_util/tuple/cons/noexcept_specs.cc: New
2019-04-27 Marc Glisse <marc.glisse@inria.fr> 2019-04-27 Marc Glisse <marc.glisse@inria.fr>
PR libstdc++/87106 PR libstdc++/87106
......
libstdc++-v3/include/std/tuple
...@@ -552,6 +552,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -552,6 +552,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return return
__and_<is_nothrow_assignable<_Elements&, _UElements>...>::value; __and_<is_nothrow_assignable<_Elements&, _UElements>...>::value;
} }
template<typename... _UElements>
static constexpr bool __nothrow_constructible()
{
return
__and_<is_nothrow_constructible<_Elements, _UElements>...>::value;
}
public: public:
template<typename _Dummy = void, template<typename _Dummy = void,
...@@ -559,6 +565,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -559,6 +565,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyDefaultConstructibleTuple(), _ImplicitlyDefaultConstructibleTuple(),
bool>::type = true> bool>::type = true>
constexpr tuple() constexpr tuple()
noexcept(__and_<is_nothrow_default_constructible<_Elements>...>::value)
: _Inherited() { } : _Inherited() { }
template<typename _Dummy = void, template<typename _Dummy = void,
...@@ -569,6 +576,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -569,6 +576,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyDefaultConstructibleTuple(), _ImplicitlyDefaultConstructibleTuple(),
bool>::type = false> bool>::type = false>
explicit constexpr tuple() explicit constexpr tuple()
noexcept(__and_<is_nothrow_default_constructible<_Elements>...>::value)
: _Inherited() { } : _Inherited() { }
// Shortcut for the cases where constructors taking _Elements... // Shortcut for the cases where constructors taking _Elements...
...@@ -586,6 +594,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -586,6 +594,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
&& (sizeof...(_Elements) >= 1), && (sizeof...(_Elements) >= 1),
bool>::type=true> bool>::type=true>
constexpr tuple(const _Elements&... __elements) constexpr tuple(const _Elements&... __elements)
noexcept(__nothrow_constructible<const _Elements&...>())
: _Inherited(__elements...) { } : _Inherited(__elements...) { }
template<typename _Dummy = void, template<typename _Dummy = void,
...@@ -597,6 +606,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -597,6 +606,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
&& (sizeof...(_Elements) >= 1), && (sizeof...(_Elements) >= 1),
bool>::type=false> bool>::type=false>
explicit constexpr tuple(const _Elements&... __elements) explicit constexpr tuple(const _Elements&... __elements)
noexcept(__nothrow_constructible<const _Elements&...>())
: _Inherited(__elements...) { } : _Inherited(__elements...) { }
// Shortcut for the cases where constructors taking _UElements... // Shortcut for the cases where constructors taking _UElements...
...@@ -624,6 +634,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -624,6 +634,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
&& (sizeof...(_Elements) >= 1), && (sizeof...(_Elements) >= 1),
bool>::type=true> bool>::type=true>
constexpr tuple(_UElements&&... __elements) constexpr tuple(_UElements&&... __elements)
noexcept(__nothrow_constructible<_UElements...>())
: _Inherited(std::forward<_UElements>(__elements)...) { } : _Inherited(std::forward<_UElements>(__elements)...) { }
template<typename... _UElements, typename template<typename... _UElements, typename
...@@ -635,6 +646,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -635,6 +646,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
&& (sizeof...(_Elements) >= 1), && (sizeof...(_Elements) >= 1),
bool>::type=false> bool>::type=false>
explicit constexpr tuple(_UElements&&... __elements) explicit constexpr tuple(_UElements&&... __elements)
noexcept(__nothrow_constructible<_UElements...>())
: _Inherited(std::forward<_UElements>(__elements)...) { } : _Inherited(std::forward<_UElements>(__elements)...) { }
constexpr tuple(const tuple&) = default; constexpr tuple(const tuple&) = default;
...@@ -656,6 +668,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -656,6 +668,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_NonNestedTuple<const tuple<_UElements...>&>(), _NonNestedTuple<const tuple<_UElements...>&>(),
bool>::type=true> bool>::type=true>
constexpr tuple(const tuple<_UElements...>& __in) constexpr tuple(const tuple<_UElements...>& __in)
noexcept(__nothrow_constructible<const _UElements&...>())
: _Inherited(static_cast<const _Tuple_impl<0, _UElements...>&>(__in)) : _Inherited(static_cast<const _Tuple_impl<0, _UElements...>&>(__in))
{ } { }
...@@ -668,6 +681,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -668,6 +681,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_NonNestedTuple<const tuple<_UElements...>&>(), _NonNestedTuple<const tuple<_UElements...>&>(),
bool>::type=false> bool>::type=false>
explicit constexpr tuple(const tuple<_UElements...>& __in) explicit constexpr tuple(const tuple<_UElements...>& __in)
noexcept(__nothrow_constructible<const _UElements&...>())
: _Inherited(static_cast<const _Tuple_impl<0, _UElements...>&>(__in)) : _Inherited(static_cast<const _Tuple_impl<0, _UElements...>&>(__in))
{ } { }
...@@ -680,6 +694,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -680,6 +694,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_NonNestedTuple<tuple<_UElements...>&&>(), _NonNestedTuple<tuple<_UElements...>&&>(),
bool>::type=true> bool>::type=true>
constexpr tuple(tuple<_UElements...>&& __in) constexpr tuple(tuple<_UElements...>&& __in)
noexcept(__nothrow_constructible<_UElements...>())
: _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { }
template<typename... _UElements, typename _Dummy = void, typename template<typename... _UElements, typename _Dummy = void, typename
...@@ -691,6 +706,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -691,6 +706,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_NonNestedTuple<tuple<_UElements...>&&>(), _NonNestedTuple<tuple<_UElements...>&&>(),
bool>::type=false> bool>::type=false>
explicit constexpr tuple(tuple<_UElements...>&& __in) explicit constexpr tuple(tuple<_UElements...>&& __in)
noexcept(__nothrow_constructible<_UElements...>())
: _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { }
// Allocator-extended constructors. // Allocator-extended constructors.
...@@ -908,6 +924,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -908,6 +924,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
is_nothrow_assignable<_T2&, _U2>>::value; is_nothrow_assignable<_T2&, _U2>>::value;
} }
template<typename _U1, typename _U2>
static constexpr bool __nothrow_constructible()
{
return __and_<is_nothrow_constructible<_T1, _U1>,
is_nothrow_constructible<_T2, _U2>>::value;
}
public: public:
template <typename _U1 = _T1, template <typename _U1 = _T1,
typename _U2 = _T2, typename _U2 = _T2,
...@@ -916,6 +939,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -916,6 +939,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__is_implicitly_default_constructible<_U2>> __is_implicitly_default_constructible<_U2>>
::value, bool>::type = true> ::value, bool>::type = true>
constexpr tuple() constexpr tuple()
noexcept(__and_<is_nothrow_default_constructible<_T1>,
is_nothrow_default_constructible<_T2>>::value)
: _Inherited() { } : _Inherited() { }
template <typename _U1 = _T1, template <typename _U1 = _T1,
...@@ -929,6 +954,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -929,6 +954,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__is_implicitly_default_constructible<_U2>>>> __is_implicitly_default_constructible<_U2>>>>
::value, bool>::type = false> ::value, bool>::type = false>
explicit constexpr tuple() explicit constexpr tuple()
noexcept(__and_<is_nothrow_default_constructible<_T1>,
is_nothrow_default_constructible<_T2>>::value)
: _Inherited() { } : _Inherited() { }
// Shortcut for the cases where constructors taking _T1, _T2 // Shortcut for the cases where constructors taking _T1, _T2
...@@ -943,6 +970,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -943,6 +970,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyConvertibleTuple<_T1, _T2>(), _ImplicitlyConvertibleTuple<_T1, _T2>(),
bool>::type = true> bool>::type = true>
constexpr tuple(const _T1& __a1, const _T2& __a2) constexpr tuple(const _T1& __a1, const _T2& __a2)
noexcept(__nothrow_constructible<const _T1&, const _T2&>())
: _Inherited(__a1, __a2) { } : _Inherited(__a1, __a2) { }
template<typename _Dummy = void, typename template<typename _Dummy = void, typename
...@@ -952,6 +980,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -952,6 +980,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyConvertibleTuple<_T1, _T2>(), _ImplicitlyConvertibleTuple<_T1, _T2>(),
bool>::type = false> bool>::type = false>
explicit constexpr tuple(const _T1& __a1, const _T2& __a2) explicit constexpr tuple(const _T1& __a1, const _T2& __a2)
noexcept(__nothrow_constructible<const _T1&, const _T2&>())
: _Inherited(__a1, __a2) { } : _Inherited(__a1, __a2) { }
// Shortcut for the cases where constructors taking _U1, _U2 // Shortcut for the cases where constructors taking _U1, _U2
...@@ -966,6 +995,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -966,6 +995,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
&& !is_same<__remove_cvref_t<_U1>, allocator_arg_t>::value, && !is_same<__remove_cvref_t<_U1>, allocator_arg_t>::value,
bool>::type = true> bool>::type = true>
constexpr tuple(_U1&& __a1, _U2&& __a2) constexpr tuple(_U1&& __a1, _U2&& __a2)
noexcept(__nothrow_constructible<_U1, _U2>())
: _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { } : _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { }
template<typename _U1, typename _U2, typename template<typename _U1, typename _U2, typename
...@@ -976,6 +1006,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -976,6 +1006,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
&& !is_same<__remove_cvref_t<_U1>, allocator_arg_t>::value, && !is_same<__remove_cvref_t<_U1>, allocator_arg_t>::value,
bool>::type = false> bool>::type = false>
explicit constexpr tuple(_U1&& __a1, _U2&& __a2) explicit constexpr tuple(_U1&& __a1, _U2&& __a2)
noexcept(__nothrow_constructible<_U1, _U2>())
: _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { } : _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { }
constexpr tuple(const tuple&) = default; constexpr tuple(const tuple&) = default;
...@@ -989,6 +1020,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -989,6 +1020,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyConvertibleTuple<_U1, _U2>(), _ImplicitlyConvertibleTuple<_U1, _U2>(),
bool>::type = true> bool>::type = true>
constexpr tuple(const tuple<_U1, _U2>& __in) constexpr tuple(const tuple<_U1, _U2>& __in)
noexcept(__nothrow_constructible<const _U1&, const _U2&>())
: _Inherited(static_cast<const _Tuple_impl<0, _U1, _U2>&>(__in)) { } : _Inherited(static_cast<const _Tuple_impl<0, _U1, _U2>&>(__in)) { }
template<typename _U1, typename _U2, typename template<typename _U1, typename _U2, typename
...@@ -998,6 +1030,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -998,6 +1030,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyConvertibleTuple<_U1, _U2>(), _ImplicitlyConvertibleTuple<_U1, _U2>(),
bool>::type = false> bool>::type = false>
explicit constexpr tuple(const tuple<_U1, _U2>& __in) explicit constexpr tuple(const tuple<_U1, _U2>& __in)
noexcept(__nothrow_constructible<const _U1&, const _U2&>())
: _Inherited(static_cast<const _Tuple_impl<0, _U1, _U2>&>(__in)) { } : _Inherited(static_cast<const _Tuple_impl<0, _U1, _U2>&>(__in)) { }
template<typename _U1, typename _U2, typename template<typename _U1, typename _U2, typename
...@@ -1007,6 +1040,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1007,6 +1040,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyMoveConvertibleTuple<_U1, _U2>(), _ImplicitlyMoveConvertibleTuple<_U1, _U2>(),
bool>::type = true> bool>::type = true>
constexpr tuple(tuple<_U1, _U2>&& __in) constexpr tuple(tuple<_U1, _U2>&& __in)
noexcept(__nothrow_constructible<_U1, _U2>())
: _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { } : _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { }
template<typename _U1, typename _U2, typename template<typename _U1, typename _U2, typename
...@@ -1016,6 +1050,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1016,6 +1050,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyMoveConvertibleTuple<_U1, _U2>(), _ImplicitlyMoveConvertibleTuple<_U1, _U2>(),
bool>::type = false> bool>::type = false>
explicit constexpr tuple(tuple<_U1, _U2>&& __in) explicit constexpr tuple(tuple<_U1, _U2>&& __in)
noexcept(__nothrow_constructible<_U1, _U2>())
: _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { } : _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { }
template<typename _U1, typename _U2, typename template<typename _U1, typename _U2, typename
...@@ -1025,6 +1060,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1025,6 +1060,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyConvertibleTuple<_U1, _U2>(), _ImplicitlyConvertibleTuple<_U1, _U2>(),
bool>::type = true> bool>::type = true>
constexpr tuple(const pair<_U1, _U2>& __in) constexpr tuple(const pair<_U1, _U2>& __in)
noexcept(__nothrow_constructible<const _U1&, const _U2&>())
: _Inherited(__in.first, __in.second) { } : _Inherited(__in.first, __in.second) { }
template<typename _U1, typename _U2, typename template<typename _U1, typename _U2, typename
...@@ -1034,6 +1070,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1034,6 +1070,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyConvertibleTuple<_U1, _U2>(), _ImplicitlyConvertibleTuple<_U1, _U2>(),
bool>::type = false> bool>::type = false>
explicit constexpr tuple(const pair<_U1, _U2>& __in) explicit constexpr tuple(const pair<_U1, _U2>& __in)
noexcept(__nothrow_constructible<const _U1&, const _U2&>())
: _Inherited(__in.first, __in.second) { } : _Inherited(__in.first, __in.second) { }
template<typename _U1, typename _U2, typename template<typename _U1, typename _U2, typename
...@@ -1043,6 +1080,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1043,6 +1080,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyMoveConvertibleTuple<_U1, _U2>(), _ImplicitlyMoveConvertibleTuple<_U1, _U2>(),
bool>::type = true> bool>::type = true>
constexpr tuple(pair<_U1, _U2>&& __in) constexpr tuple(pair<_U1, _U2>&& __in)
noexcept(__nothrow_constructible<_U1, _U2>())
: _Inherited(std::forward<_U1>(__in.first), : _Inherited(std::forward<_U1>(__in.first),
std::forward<_U2>(__in.second)) { } std::forward<_U2>(__in.second)) { }
...@@ -1053,6 +1091,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1053,6 +1091,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_ImplicitlyMoveConvertibleTuple<_U1, _U2>(), _ImplicitlyMoveConvertibleTuple<_U1, _U2>(),
bool>::type = false> bool>::type = false>
explicit constexpr tuple(pair<_U1, _U2>&& __in) explicit constexpr tuple(pair<_U1, _U2>&& __in)
noexcept(__nothrow_constructible<_U1, _U2>())
: _Inherited(std::forward<_U1>(__in.first), : _Inherited(std::forward<_U1>(__in.first),
std::forward<_U2>(__in.second)) { } std::forward<_U2>(__in.second)) { }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment