maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libc++] Fix constexpr-ness of std::tuple's constructor 

Mentioned in https://reviews.llvm.org/D96523.
This commit is contained in:
Louis Dionne 2021-04-30 15:52:26 -04:00
parent 3489c2d7b1
commit ef89e8ca1c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcxx/include/tuple
View File

@ -466,7 +466,7 @@ public:
_IsImpDefault<_Tp>... // explicit check
>::value
, int> = 0>
_LIBCPP_INLINE_VISIBILITY constexpr
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
tuple()
_NOEXCEPT_(_And<is_nothrow_default_constructible<_Tp>...>::value)
{ }
@ -896,7 +896,7 @@ public:
_EnableImplicitMoveFromPair<_Up1, _Up2, _Tp...>
>::value
, int> = 0>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
tuple(pair<_Up1, _Up2>&& __p)
_NOEXCEPT_((_And<
is_nothrow_constructible<_FirstType<_Tp...>, _Up1>,
@ -911,7 +911,7 @@ public:
_EnableExplicitMoveFromPair<_Up1, _Up2, _Tp...>
>::value
, int> = 0>
_LIBCPP_INLINE_VISIBILITY
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
explicit tuple(pair<_Up1, _Up2>&& __p)
_NOEXCEPT_((_And<
is_nothrow_constructible<_FirstType<_Tp...>, _Up1>,

9
libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp
View File

@ -47,5 +47,14 @@ int main(int, char**)
assert(std::get<1>(t1)->id_ == 3);
}
#if TEST_STD_VER > 11
{
using pair_t = std::pair<int, char>;
constexpr std::tuple<long, long> t(pair_t(0, 'a'));
static_assert(std::get<0>(t) == 0, "");
static_assert(std::get<1>(t) == 'a', "");
}
#endif
return 0;
}