LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update coroutine_handle<P>::promise to reflect N4663.

Browse Source 
This patch updates the promise() member to match the current spec.
Specifically it removes the non-const overload and make the return
type of the const overload non-const.

This patch also makes the ASSERT_NOT_NOEXCEPT tests libc++ specific,
since other implementations may be free to strengthen the specification.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@303895 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-05-25 18:52:34 +00:00
parent a42191c839
commit 0b958696f5
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/experimental/coroutine
View File

@@ -195,17 +195,11 @@ public:
} }
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
_Promise& promise() { _Promise& promise() const {
return *reinterpret_cast<_Promise*>( return *reinterpret_cast<_Promise*>(
__builtin_coro_promise(this->__handle_, alignof(_Promise), false)); __builtin_coro_promise(this->__handle_, alignof(_Promise), false));
} }
_LIBCPP_INLINE_VISIBILITY
_Promise const& promise() const {
return *reinterpret_cast<_Promise const*>(
__builtin_coro_promise(this->__handle_, alignof(_Promise), false));
}
public: public:
_LIBCPP_ALWAYS_INLINE _LIBCPP_ALWAYS_INLINE
static coroutine_handle from_address(void* __addr) noexcept { static coroutine_handle from_address(void* __addr) noexcept {

6
test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.sh.cpp
View File

@@ -39,12 +39,12 @@ void do_test(coro::coroutine_handle<Promise>&& H) {
// FIXME Add a runtime test // FIXME Add a runtime test
{ {
ASSERT_SAME_TYPE(decltype(H.promise()), Promise&); ASSERT_SAME_TYPE(decltype(H.promise()), Promise&);
ASSERT_NOT_NOEXCEPT(H.promise()); LIBCPP_ASSERT_NOT_NOEXCEPT(H.promise());
} }
{ {
auto const& CH = H; auto const& CH = H;
ASSERT_SAME_TYPE(decltype(CH.promise()), Promise const&); ASSERT_SAME_TYPE(decltype(CH.promise()), Promise&);
ASSERT_NOT_NOEXCEPT(CH.promise()); LIBCPP_ASSERT_NOT_NOEXCEPT(CH.promise());
} }
} }