svn commit: r319236 - in vendor/libc++/dist: include include/experimental test/std/experimental/language.support/support.coroutines test/std/experimental/language.support/support.coroutines/corouti...

[Dimitry Andric]

Author: dim
Date: Tue May 30 17:37:59 2017
New Revision: 319236
URL: https://svnweb.freebsd.org/changeset/base/319236

Log:
  Vendor import of libc++ trunk r304222:
  https://llvm.org/svn/llvm-project/libcxx/trunk@304222

Added:
  vendor/libc++/dist/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.fail.cpp   (contents, props changed)
  vendor/libc++/dist/test/std/experimental/language.support/support.coroutines/lit.local.cfg
Modified:
  vendor/libc++/dist/include/experimental/coroutine
  vendor/libc++/dist/include/module.modulemap

Modified: vendor/libc++/dist/include/experimental/coroutine
==============================================================================
--- vendor/libc++/dist/include/experimental/coroutine	Tue May 30 17:37:54 2017	(r319235)
+++ vendor/libc++/dist/include/experimental/coroutine	Tue May 30 17:37:59 2017	(r319236)
@@ -145,6 +145,19 @@ class _LIBCPP_TEMPLATE_VIS coroutine_handle<void> { (p
         return __tmp;
     }
 
+    // FIXME: Should from_address(nullptr) be allowed?
+    _LIBCPP_ALWAYS_INLINE
+    static coroutine_handle from_address(nullptr_t) _NOEXCEPT {
+      return coroutine_handle(nullptr);
+    }
+
+    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:
   bool __is_suspended() const _NOEXCEPT  {
     // FIXME actually implement a check for if the coro is suspended.
@@ -218,11 +231,22 @@ class _LIBCPP_TEMPLATE_VIS coroutine_handle : public c
     // FIXME: should from_address work with nullptr?
     _LIBCPP_ALWAYS_INLINE
     static coroutine_handle from_address(nullptr_t) _NOEXCEPT {
-      return {};
+      return coroutine_handle(nullptr);
     }
 
-    // from_address cannot be used with the coroutines promise type.
-    static coroutine_handle from_address(_Promise*) = delete;
+    template <class _Tp, bool _CallIsValid = false>
+    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
     static coroutine_handle from_promise(_Promise& __promise) _NOEXCEPT {

Modified: vendor/libc++/dist/include/module.modulemap
==============================================================================
--- vendor/libc++/dist/include/module.modulemap	Tue May 30 17:37:54 2017	(r319235)
+++ vendor/libc++/dist/include/module.modulemap	Tue May 30 17:37:59 2017	(r319236)
@@ -502,6 +502,7 @@ module std [system] {
       export *
     }
      module coroutine {
+      requires coroutines
       header "experimental/coroutine"
       export *
     }

Added: vendor/libc++/dist/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.fail.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libc++/dist/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.fail.cpp	Tue May 30 17:37:59 2017	(r319236)
@@ -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 at 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 at 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 at 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}}
+  }
+}

Added: vendor/libc++/dist/test/std/experimental/language.support/support.coroutines/lit.local.cfg
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libc++/dist/test/std/experimental/language.support/support.coroutines/lit.local.cfg	Tue May 30 17:37:59 2017	(r319236)
@@ -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']