procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement the missing bits of LWG 2769

Browse source 
* include/std/any (any_cast(const any&)): Add static_assert.
(any_cast(any&)): Likewise.
(any_cast(any&&)): Likewise, and remove the handling
for copyable-but-not-movable type.
* testsuite/20_util/any/misc/any_cast.cc: Adjust.
* testsuite/20_util/any/misc/any_cast_neg.cc: Likewise, and
add new tests.

From-SVN: r258031
This commit is contained in:
Ville Voutilainen 2018-02-27 13:33:30 +02:00 • committed by Ville Voutilainen
parent 2be4b342e0
commit 23c3a05908
4 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,14 @@
2018-02-27 Ville Voutilainen <ville.voutilainen@gmail.com>
Implement the missing bits of LWG 2769
* include/std/any (any_cast(const any&)): Add static_assert.
(any_cast(any&)): Likewise.
(any_cast(any&&)): Likewise, and remove the handling
for copyable-but-not-movable type.
* testsuite/20_util/any/misc/any_cast.cc: Adjust.
* testsuite/20_util/any/misc/any_cast_neg.cc: Likewise, and
add new tests.
2018-02-23 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/84532

36
libstdc++-v3/include/std/any
View file

@ -438,8 +438,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return any(in_place_type<_Tp>, __il, std::forward<_Args>(__args)...);
}
template <typename _Tp>
using _AnyCast = remove_cv_t<remove_reference_t<_Tp>>;
/**
* @brief Access the contained object.
*
@ -453,9 +451,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _ValueType>
inline _ValueType any_cast(const any& __any)
{
using _Up = remove_cv_t<remove_reference_t<_ValueType>>;
static_assert(any::__is_valid_cast<_ValueType>(),
"Template argument must be a reference or CopyConstructible type");
auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
static_assert(is_constructible_v<_ValueType, const _Up&>,
"Template argument must be constructible from a const value.");
auto __p = any_cast<_Up>(&__any);
if (__p)
return static_cast<_ValueType>(*__p);
__throw_bad_any_cast();
@ -476,37 +477,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _ValueType>
inline _ValueType any_cast(any& __any)
{
using _Up = remove_cv_t<remove_reference_t<_ValueType>>;
static_assert(any::__is_valid_cast<_ValueType>(),
"Template argument must be a reference or CopyConstructible type");
auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
static_assert(is_constructible_v<_ValueType, _Up&>,
"Template argument must be constructible from an lvalue.");
auto __p = any_cast<_Up>(&__any);
if (__p)
return static_cast<_ValueType>(*__p);
__throw_bad_any_cast();
}
template<typename _ValueType,
typename enable_if<!is_move_constructible<_ValueType>::value
|| is_lvalue_reference<_ValueType>::value,
bool>::type = true>
template<typename _ValueType>
inline _ValueType any_cast(any&& __any)
{
using _Up = remove_cv_t<remove_reference_t<_ValueType>>;
static_assert(any::__is_valid_cast<_ValueType>(),
"Template argument must be a reference or CopyConstructible type");
auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
if (__p)
return static_cast<_ValueType>(*__p);
__throw_bad_any_cast();
}
template<typename _ValueType,
typename enable_if<is_move_constructible<_ValueType>::value
&& !is_lvalue_reference<_ValueType>::value,
bool>::type = false>
inline _ValueType any_cast(any&& __any)
{
static_assert(any::__is_valid_cast<_ValueType>(),
"Template argument must be a reference or CopyConstructible type");
auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
static_assert(is_constructible_v<_ValueType, _Up>,
"Template argument must be constructible from an rvalue.");
auto __p = any_cast<_Up>(&__any);
if (__p)
return static_cast<_ValueType>(std::move(*__p));
__throw_bad_any_cast();

9
libstdc++-v3/testsuite/20_util/any/misc/any_cast.cc
View file

@ -95,15 +95,6 @@ void test03()
VERIFY(move_count == 1);
MoveEnabled&& m3 = any_cast<MoveEnabled&&>(any(m));
VERIFY(move_count == 1);
struct MoveDeleted
{
MoveDeleted(MoveDeleted&&) = delete;
MoveDeleted() = default;
MoveDeleted(const MoveDeleted&) = default;
};
MoveDeleted md;
MoveDeleted&& md2 = any_cast<MoveDeleted>(any(std::move(md)));
MoveDeleted&& md3 = any_cast<MoveDeleted&&>(any(std::move(md)));
}
void test04()

23
libstdc++-v3/testsuite/20_util/any/misc/any_cast_neg.cc
View file

@ -20,11 +20,26 @@
#include <any>
using std::any;
using std::any_cast;
void test01()
{
using std::any;
using std::any_cast;
const any y(1);
any_cast<int&>(y); // { dg-error "invalid static_cast" "" { target { *-*-* } } 460 }
any_cast<int&>(y); // { dg-error "invalid static_cast" "" { target { *-*-* } } 461 }
// { dg-error "Template argument must be constructible from a const value" "" { target { *-*-* } } 457 }
}
void test02()
{
any y(1);
any_cast<int&&>(y);
// { dg-error "Template argument must be constructible from an lvalue" "" { target { *-*-* } } 483 }
}
void test03()
{
any y(1);
any_cast<int&>(std::move(y)); // { dg-error "invalid static_cast" "" { target { *-*-* } } 501 }
// { dg-error "Template argument must be constructible from an rvalue" "" { target { *-*-* } } 497 }
}