[coroutines] Make coroutine_handle<T>::from_address ill-formed for everything but void*.
from_address requires that the provided pointer refer to the suspended coroutine, which doesn't have a type, or at least not one knowable by the user. Therefore every use of `from_address` with a typed pointer is almost certainly a bug. This behavior is a part of the TS specification, but hopefully it will be in the future. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@304172 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -145,6 +145,19 @@ public:
|
|||||||
return __tmp;
|
return __tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FIXME: Should from_address(nullptr) be allowed?
|
||||||
|
_LIBCPP_ALWAYS_INLINE
|
||||||
|
static coroutine_handle from_address(nullptr_t) _NOEXCEPT {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class _Tp, bool _CallIsValid = false>
|
||||||
|
static coroutine_handle from_address(_Tp*) {
|
||||||
|
static_assert(_CallIsValid,
|
||||||
|
"coroutine_handle<void>::from_address cannot be called with "
|
||||||
|
"non-void pointers");
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool __is_suspended() const _NOEXCEPT {
|
bool __is_suspended() const _NOEXCEPT {
|
||||||
// FIXME actually implement a check for if the coro is suspended.
|
// FIXME actually implement a check for if the coro is suspended.
|
||||||
@@ -221,8 +234,19 @@ public:
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
// from_address cannot be used with the coroutines promise type.
|
template <class _Tp, bool _CallIsValid = false>
|
||||||
static coroutine_handle from_address(_Promise*) = delete;
|
static coroutine_handle from_address(_Tp*) {
|
||||||
|
static_assert(_CallIsValid,
|
||||||
|
"coroutine_handle<promise_type>::from_address cannot be called with "
|
||||||
|
"non-void pointers");
|
||||||
|
}
|
||||||
|
|
||||||
|
template <bool _CallIsValid = false>
|
||||||
|
static coroutine_handle from_address(_Promise*) {
|
||||||
|
static_assert(_CallIsValid,
|
||||||
|
"coroutine_handle<promise_type>::from_address cannot be used with "
|
||||||
|
"pointers to the coroutine's promise type; use 'from_promise' instead");
|
||||||
|
}
|
||||||
|
|
||||||
_LIBCPP_ALWAYS_INLINE
|
_LIBCPP_ALWAYS_INLINE
|
||||||
static coroutine_handle from_promise(_Promise& __promise) _NOEXCEPT {
|
static coroutine_handle from_promise(_Promise& __promise) _NOEXCEPT {
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
// -*- C++ -*-
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
//
|
||||||
|
// The LLVM Compiler Infrastructure
|
||||||
|
//
|
||||||
|
// This file is dual licensed under the MIT and the University of Illinois Open
|
||||||
|
// Source Licenses. See LICENSE.TXT for details.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
// UNSUPPORTED: c++98, c++03, c++11
|
||||||
|
// <experimental/coroutine>
|
||||||
|
|
||||||
|
// template <class Promise = void>
|
||||||
|
// struct coroutine_handle;
|
||||||
|
|
||||||
|
// static coroutine_handle from_address(void*) noexcept
|
||||||
|
|
||||||
|
// Test that `from_address` is explicitly ill-formed when called with a typed
|
||||||
|
// pointer. The user cannot possibly have a typed pointer to the coroutine.
|
||||||
|
// FIXME: This behavior is an extension, and should upstreamed into the TS or
|
||||||
|
// the test removed if the TS changes are rejected.
|
||||||
|
|
||||||
|
#include <experimental/coroutine>
|
||||||
|
#include <type_traits>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
|
namespace coro = std::experimental;
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
{
|
||||||
|
using H = coro::coroutine_handle<>;
|
||||||
|
// expected-error@experimental/coroutine:* 3 {{coroutine_handle<void>::from_address cannot be called with non-void pointers}}
|
||||||
|
H::from_address((int*)nullptr); // expected-note {{requested here}}
|
||||||
|
H::from_address((const void*)nullptr); // expected-note {{requested here}}
|
||||||
|
H::from_address((const char*)nullptr); // expected-note {{requested here}}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
using H = coro::coroutine_handle<int>;
|
||||||
|
// expected-error@experimental/coroutine:* 1 {{static_assert failed "coroutine_handle<promise_type>::from_address cannot be used with pointers to the coroutine's promise type; use 'from_promise' instead"}}
|
||||||
|
H::from_address((const char*)nullptr); // expected-note {{requested here}}
|
||||||
|
// expected-error@experimental/coroutine:* 1 {{coroutine_handle<promise_type>::from_address cannot be called with non-void pointers}}
|
||||||
|
H::from_address((int*)nullptr); // expected-note {{requested here}}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# If the compiler doesn't support coroutines mark all of the tests under
|
||||||
|
# this directory as unsupported. Otherwise add the required `-fcoroutines-ts`
|
||||||
|
# flag.
|
||||||
|
if 'fcoroutines-ts' not in config.available_features:
|
||||||
|
config.unsupported = True
|
||||||
|
else:
|
||||||
|
import copy
|
||||||
|
config.test_format.cxx = copy.deepcopy(config.test_format.cxx)
|
||||||
|
config.test_format.cxx.compile_flags += ['-fcoroutines-ts']
|
||||||
Reference in New Issue
Block a user