summaryrefslogtreecommitdiffstats
path: root/libcxx/include/experimental/coroutine
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2017-05-29 06:42:01 +0000
committerEric Fiselier <eric@efcs.ca>2017-05-29 06:42:01 +0000
commitbae0a1d43c60c5cb69446fd98baa68ac501e396a (patch)
treee84770bb092c72d16ead194c12449f1c9a3f3b11 /libcxx/include/experimental/coroutine
parent96ab48f9dac815219ed7f9a62283ce29e96429bd (diff)
downloadbcm5719-llvm-bae0a1d43c60c5cb69446fd98baa68ac501e396a.tar.gz
bcm5719-llvm-bae0a1d43c60c5cb69446fd98baa68ac501e396a.zip
Fix coroutine test failures caused by API misusages.
More tests to come. I think that from_address overload should be deleted or ill-formed, except for the 'void*' one; The user cannot possibly have a typed pointer to the coroutine state. llvm-svn: 304131
Diffstat (limited to 'libcxx/include/experimental/coroutine')
-rw-r--r--libcxx/include/experimental/coroutine9
1 files changed, 9 insertions, 0 deletions
diff --git a/libcxx/include/experimental/coroutine b/libcxx/include/experimental/coroutine
index 42ee3ed2f97..d2a03ae8a8c 100644
--- a/libcxx/include/experimental/coroutine
+++ b/libcxx/include/experimental/coroutine
@@ -212,6 +212,15 @@ public:
return __tmp;
}
+ // NOTE: this overload isn't required by the standard but is needed so
+ // the deleted _Promise* overload doesn't make from_address(nullptr)
+ // ambiguous.
+ // FIXME: should from_address work with nullptr?
+ _LIBCPP_ALWAYS_INLINE
+ static coroutine_handle from_address(nullptr_t) _NOEXCEPT {
+ return {};
+ }
+
// from_address cannot be used with the coroutines promise type.
static coroutine_handle from_address(_Promise*) = delete;
OpenPOWER on IntegriCloud