passenger 6.0.14 → 6.0.15

data/src/cxx_supportlib/vendor-modified/boost/asio/impl/spawn.hpp

@@ -2,7 +2,7 @@
 // impl/spawn.hpp
 // ~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +17,7 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/associated_allocator.hpp>
+#include <boost/asio/associated_cancellation_slot.hpp>
 #include <boost/asio/associated_executor.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/bind_executor.hpp>
@@ -27,385 +28,1429 @@
 #include <boost/asio/detail/memory.hpp>
 #include <boost/asio/detail/noncopyable.hpp>
 #include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/detail/utility.hpp>
+#include <boost/asio/detail/variadic_templates.hpp>
 #include <boost/system/system_error.hpp>
 
+#if defined(BOOST_ASIO_HAS_STD_TUPLE)
+# include <tuple>
+#endif // defined(BOOST_ASIO_HAS_STD_TUPLE)
+
+#if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+# include <boost/context/fiber.hpp>
+#endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
 namespace detail {
 
-  template <typename Handler, typename T>
-  class coro_handler
+#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+
+// Spawned thread implementation using Boost.Coroutine.
+class spawned_coroutine_thread : public spawned_thread_base
+{
+public:
+#if defined(BOOST_COROUTINES_UNIDIRECT) || defined(BOOST_COROUTINES_V2)
+  typedef boost::coroutines::pull_coroutine<void> callee_type;
+  typedef boost::coroutines::push_coroutine<void> caller_type;
+#else
+  typedef boost::coroutines::coroutine<void()> callee_type;
+  typedef boost::coroutines::coroutine<void()> caller_type;
+#endif
+
+  spawned_coroutine_thread(caller_type& caller)
+    : caller_(caller),
+      on_suspend_fn_(0),
+      on_suspend_arg_(0)
   {
-  public:
-    coro_handler(basic_yield_context<Handler> ctx)
-      : coro_(ctx.coro_.lock()),
-        ca_(ctx.ca_),
-        handler_(ctx.handler_),
-        ready_(0),
-        ec_(ctx.ec_),
-        value_(0)
+  }
+
+  template <typename F>
+  static spawned_thread_base* spawn(BOOST_ASIO_MOVE_ARG(F) f,
+      const boost::coroutines::attributes& attributes,
+      cancellation_slot parent_cancel_slot = cancellation_slot(),
+      cancellation_state cancel_state = cancellation_state())
+  {
+    spawned_coroutine_thread* spawned_thread = 0;
+    callee_type callee(entry_point<typename decay<F>::type>(
+          BOOST_ASIO_MOVE_CAST(F)(f), &spawned_thread), attributes);
+    spawned_thread->callee_.swap(callee);
+    spawned_thread->parent_cancellation_slot_ = parent_cancel_slot;
+    spawned_thread->cancellation_state_ = cancel_state;
+    return spawned_thread;
+  }
+
+  template <typename F>
+  static spawned_thread_base* spawn(BOOST_ASIO_MOVE_ARG(F) f,
+      cancellation_slot parent_cancel_slot = cancellation_slot(),
+      cancellation_state cancel_state = cancellation_state())
+  {
+    return spawn(BOOST_ASIO_MOVE_CAST(F)(f), boost::coroutines::attributes(),
+        parent_cancel_slot, cancel_state);
+  }
+
+  void resume()
+  {
+    callee_();
+    if (on_suspend_fn_)
     {
+      void (*fn)(void*) = on_suspend_fn_;
+      void* arg = on_suspend_arg_;
+      on_suspend_fn_ = 0;
+      fn(arg);
     }
+  }
 
-    void operator()(T value)
+  void suspend_with(void (*fn)(void*), void* arg)
+  {
+    if (throw_if_cancelled_)
+      if (!!cancellation_state_.cancelled())
+        throw_error(boost::asio::error::operation_aborted, "yield");
+    has_context_switched_ = true;
+    on_suspend_fn_ = fn;
+    on_suspend_arg_ = arg;
+    caller_();
+  }
+
+  void destroy()
+  {
+    callee_type callee;
+    callee.swap(callee_);
+  }
+
+private:
+  template <typename Function>
+  class entry_point
+  {
+  public:
+    template <typename F>
+    entry_point(BOOST_ASIO_MOVE_ARG(F) f,
+        spawned_coroutine_thread** spawned_thread_out)
+      : function_(BOOST_ASIO_MOVE_CAST(F)(f)),
+        spawned_thread_out_(spawned_thread_out)
     {
-      *ec_ = boost::system::error_code();
-      *value_ = BOOST_ASIO_MOVE_CAST(T)(value);
-      if (--*ready_ == 0)
-        (*coro_)();
     }
 
-    void operator()(boost::system::error_code ec, T value)
+    void operator()(caller_type& caller)
     {
-      *ec_ = ec;
-      *value_ = BOOST_ASIO_MOVE_CAST(T)(value);
-      if (--*ready_ == 0)
-        (*coro_)();
+      Function function(BOOST_ASIO_MOVE_CAST(Function)(function_));
+      spawned_coroutine_thread spawned_thread(caller);
+      *spawned_thread_out_ = &spawned_thread;
+      spawned_thread_out_ = 0;
+      spawned_thread.suspend();
+      function(&spawned_thread);
+      spawned_thread.suspend();
     }
 
-  //private:
-    shared_ptr<typename basic_yield_context<Handler>::callee_type> coro_;
-    typename basic_yield_context<Handler>::caller_type& ca_;
-    Handler handler_;
-    atomic_count* ready_;
-    boost::system::error_code* ec_;
-    T* value_;
+  private:
+    Function function_;
+    spawned_coroutine_thread** spawned_thread_out_;
   };
 
-  template <typename Handler>
-  class coro_handler<Handler, void>
+  caller_type& caller_;
+  callee_type callee_;
+  void (*on_suspend_fn_)(void*);
+  void* on_suspend_arg_;
+};
+
+#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+
+#if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+
+// Spawned thread implementation using Boost.Context's fiber.
+class spawned_fiber_thread : public spawned_thread_base
+{
+public:
+  typedef boost::context::fiber fiber_type;
+
+  spawned_fiber_thread(BOOST_ASIO_MOVE_ARG(fiber_type) caller)
+    : caller_(BOOST_ASIO_MOVE_CAST(fiber_type)(caller)),
+      on_suspend_fn_(0),
+      on_suspend_arg_(0)
   {
-  public:
-    coro_handler(basic_yield_context<Handler> ctx)
-      : coro_(ctx.coro_.lock()),
-        ca_(ctx.ca_),
-        handler_(ctx.handler_),
-        ready_(0),
-        ec_(ctx.ec_)
+  }
+
+  template <typename StackAllocator, typename F>
+  static spawned_thread_base* spawn(allocator_arg_t,
+      BOOST_ASIO_MOVE_ARG(StackAllocator) stack_allocator,
+      BOOST_ASIO_MOVE_ARG(F) f,
+      cancellation_slot parent_cancel_slot = cancellation_slot(),
+      cancellation_state cancel_state = cancellation_state())
+  {
+    spawned_fiber_thread* spawned_thread = 0;
+    fiber_type callee(allocator_arg_t(),
+        BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+        entry_point<typename decay<F>::type>(
+          BOOST_ASIO_MOVE_CAST(F)(f), &spawned_thread));
+    callee = fiber_type(BOOST_ASIO_MOVE_CAST(fiber_type)(callee)).resume();
+    spawned_thread->callee_ = BOOST_ASIO_MOVE_CAST(fiber_type)(callee);
+    spawned_thread->parent_cancellation_slot_ = parent_cancel_slot;
+    spawned_thread->cancellation_state_ = cancel_state;
+    return spawned_thread;
+  }
+
+  template <typename F>
+  static spawned_thread_base* spawn(BOOST_ASIO_MOVE_ARG(F) f,
+      cancellation_slot parent_cancel_slot = cancellation_slot(),
+      cancellation_state cancel_state = cancellation_state())
+  {
+    return spawn(allocator_arg_t(), boost::context::fixedsize_stack(),
+        BOOST_ASIO_MOVE_CAST(F)(f), parent_cancel_slot, cancel_state);
+  }
+
+  void resume()
+  {
+    callee_ = fiber_type(BOOST_ASIO_MOVE_CAST(fiber_type)(callee_)).resume();
+    if (on_suspend_fn_)
     {
+      void (*fn)(void*) = on_suspend_fn_;
+      void* arg = on_suspend_arg_;
+      on_suspend_fn_ = 0;
+      fn(arg);
     }
+  }
 
-    void operator()()
+  void suspend_with(void (*fn)(void*), void* arg)
+  {
+    if (throw_if_cancelled_)
+      if (!!cancellation_state_.cancelled())
+        throw_error(boost::asio::error::operation_aborted, "yield");
+    has_context_switched_ = true;
+    on_suspend_fn_ = fn;
+    on_suspend_arg_ = arg;
+    caller_ = fiber_type(BOOST_ASIO_MOVE_CAST(fiber_type)(caller_)).resume();
+  }
+
+  void destroy()
+  {
+    fiber_type callee = BOOST_ASIO_MOVE_CAST(fiber_type)(callee_);
+    (void)callee;
+  }
+
+private:
+  template <typename Function>
+  class entry_point
+  {
+  public:
+    template <typename F>
+    entry_point(BOOST_ASIO_MOVE_ARG(F) f,
+        spawned_fiber_thread** spawned_thread_out)
+      : function_(BOOST_ASIO_MOVE_CAST(F)(f)),
+        spawned_thread_out_(spawned_thread_out)
     {
-      *ec_ = boost::system::error_code();
-      if (--*ready_ == 0)
-        (*coro_)();
     }
 
-    void operator()(boost::system::error_code ec)
+    fiber_type operator()(BOOST_ASIO_MOVE_ARG(fiber_type) caller)
     {
-      *ec_ = ec;
-      if (--*ready_ == 0)
-        (*coro_)();
+      Function function(BOOST_ASIO_MOVE_CAST(Function)(function_));
+      spawned_fiber_thread spawned_thread(
+          BOOST_ASIO_MOVE_CAST(fiber_type)(caller));
+      *spawned_thread_out_ = &spawned_thread;
+      spawned_thread_out_ = 0;
+      spawned_thread.suspend();
+      function(&spawned_thread);
+      spawned_thread.suspend();
+      return {};
     }
 
-  //private:
-    shared_ptr<typename basic_yield_context<Handler>::callee_type> coro_;
-    typename basic_yield_context<Handler>::caller_type& ca_;
-    Handler handler_;
-    atomic_count* ready_;
-    boost::system::error_code* ec_;
+  private:
+    Function function_;
+    spawned_fiber_thread** spawned_thread_out_;
   };
 
-  template <typename Handler, typename T>
-  inline asio_handler_allocate_is_deprecated
-  asio_handler_allocate(std::size_t size,
-      coro_handler<Handler, T>* this_handler)
+  fiber_type caller_;
+  fiber_type callee_;
+  void (*on_suspend_fn_)(void*);
+  void* on_suspend_arg_;
+};
+
+#endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+
+#if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+typedef spawned_fiber_thread default_spawned_thread_type;
+#elif defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+typedef spawned_coroutine_thread default_spawned_thread_type;
+#else
+# error No spawn() implementation available
+#endif
+
+// Helper class to perform the initial resume on the correct executor.
+class spawned_thread_resumer
+{
+public:
+  explicit spawned_thread_resumer(spawned_thread_base* spawned_thread)
+    : spawned_thread_(spawned_thread)
   {
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-    boost_asio_handler_alloc_helpers::allocate(size, this_handler->handler_);
-    return asio_handler_allocate_is_no_longer_used();
-#else // defined(BOOST_ASIO_NO_DEPRECATED)
-    return boost_asio_handler_alloc_helpers::allocate(
-        size, this_handler->handler_);
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
+#if !defined(BOOST_ASIO_HAS_MOVE)
+    spawned_thread->detach();
+    spawned_thread->attach(&spawned_thread_);
+#endif // !defined(BOOST_ASIO_HAS_MOVE)
   }
 
-  template <typename Handler, typename T>
-  inline asio_handler_deallocate_is_deprecated
-  asio_handler_deallocate(void* pointer, std::size_t size,
-      coro_handler<Handler, T>* this_handler)
+#if defined(BOOST_ASIO_HAS_MOVE)
+
+  spawned_thread_resumer(spawned_thread_resumer&& other) BOOST_ASIO_NOEXCEPT
+    : spawned_thread_(other.spawned_thread_)
   {
-    boost_asio_handler_alloc_helpers::deallocate(
-        pointer, size, this_handler->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-    return asio_handler_deallocate_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
+    other.spawned_thread_ = 0;
   }
 
-  template <typename Handler, typename T>
-  inline bool asio_handler_is_continuation(coro_handler<Handler, T>*)
+#else // defined(BOOST_ASIO_HAS_MOVE)
+
+  spawned_thread_resumer(
+      const spawned_thread_resumer& other) BOOST_ASIO_NOEXCEPT
+    : spawned_thread_(other.spawned_thread_)
   {
-    return true;
+    spawned_thread_->detach();
+    spawned_thread_->attach(&spawned_thread_);
   }
 
-  template <typename Function, typename Handler, typename T>
-  inline asio_handler_invoke_is_deprecated
-  asio_handler_invoke(Function& function,
-      coro_handler<Handler, T>* this_handler)
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+
+  ~spawned_thread_resumer()
   {
-    boost_asio_handler_invoke_helpers::invoke(
-        function, this_handler->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-    return asio_handler_invoke_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
+    if (spawned_thread_)
+      spawned_thread_->destroy();
   }
 
-  template <typename Function, typename Handler, typename T>
-  inline asio_handler_invoke_is_deprecated
-  asio_handler_invoke(const Function& function,
-      coro_handler<Handler, T>* this_handler)
+  void operator()()
   {
-    boost_asio_handler_invoke_helpers::invoke(
-        function, this_handler->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-    return asio_handler_invoke_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
+#if defined(BOOST_ASIO_HAS_MOVE)
+    spawned_thread_->attach(&spawned_thread_);
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+    spawned_thread_->resume();
   }
 
-  template <typename Handler, typename T>
-  class coro_async_result
+private:
+  spawned_thread_base* spawned_thread_;
+};
+
+// Helper class to ensure spawned threads are destroyed on the correct executor.
+class spawned_thread_destroyer
+{
+public:
+  explicit spawned_thread_destroyer(spawned_thread_base* spawned_thread)
+    : spawned_thread_(spawned_thread)
   {
-  public:
-    typedef coro_handler<Handler, T> completion_handler_type;
-    typedef T return_type;
+    spawned_thread->detach();
+#if !defined(BOOST_ASIO_HAS_MOVE)
+    spawned_thread->attach(&spawned_thread_);
+#endif // !defined(BOOST_ASIO_HAS_MOVE)
+  }
 
-    explicit coro_async_result(completion_handler_type& h)
-      : handler_(h),
-        ca_(h.ca_),
-        ready_(2)
-    {
-      h.ready_ = &ready_;
-      out_ec_ = h.ec_;
-      if (!out_ec_) h.ec_ = &ec_;
-      h.value_ = &value_;
-    }
+#if defined(BOOST_ASIO_HAS_MOVE)
 
-    return_type get()
-    {
-      // Must not hold shared_ptr to coro while suspended.
-      handler_.coro_.reset();
+  spawned_thread_destroyer(spawned_thread_destroyer&& other) BOOST_ASIO_NOEXCEPT
+    : spawned_thread_(other.spawned_thread_)
+  {
+    other.spawned_thread_ = 0;
+  }
 
-      if (--ready_ != 0)
-        ca_();
-      if (!out_ec_ && ec_) throw boost::system::system_error(ec_);
-      return BOOST_ASIO_MOVE_CAST(return_type)(value_);
-    }
+#else // defined(BOOST_ASIO_HAS_MOVE)
 
-  private:
-    completion_handler_type& handler_;
-    typename basic_yield_context<Handler>::caller_type& ca_;
-    atomic_count ready_;
-    boost::system::error_code* out_ec_;
-    boost::system::error_code ec_;
-    return_type value_;
-  };
+  spawned_thread_destroyer(
+      const spawned_thread_destroyer& other) BOOST_ASIO_NOEXCEPT
+    : spawned_thread_(other.spawned_thread_)
+  {
+    spawned_thread_->detach();
+    spawned_thread_->attach(&spawned_thread_);
+  }
+
+#endif // defined(BOOST_ASIO_HAS_MOVE)
 
-  template <typename Handler>
-  class coro_async_result<Handler, void>
+  ~spawned_thread_destroyer()
   {
-  public:
-    typedef coro_handler<Handler, void> completion_handler_type;
-    typedef void return_type;
+    if (spawned_thread_)
+      spawned_thread_->destroy();
+  }
 
-    explicit coro_async_result(completion_handler_type& h)
-      : handler_(h),
-        ca_(h.ca_),
-        ready_(2)
+  void operator()()
+  {
+    if (spawned_thread_)
     {
-      h.ready_ = &ready_;
-      out_ec_ = h.ec_;
-      if (!out_ec_) h.ec_ = &ec_;
+      spawned_thread_->destroy();
+      spawned_thread_ = 0;
     }
+  }
 
-    void get()
-    {
-      // Must not hold shared_ptr to coro while suspended.
-      handler_.coro_.reset();
+private:
+  spawned_thread_base* spawned_thread_;
+};
 
-      if (--ready_ != 0)
-        ca_();
-      if (!out_ec_ && ec_) throw boost::system::system_error(ec_);
-    }
+// Base class for all completion handlers associated with a spawned thread.
+template <typename Executor>
+class spawn_handler_base
+{
+public:
+  typedef Executor executor_type;
+  typedef cancellation_slot cancellation_slot_type;
 
-  private:
-    completion_handler_type& handler_;
-    typename basic_yield_context<Handler>::caller_type& ca_;
-    atomic_count ready_;
-    boost::system::error_code* out_ec_;
-    boost::system::error_code ec_;
-  };
+  spawn_handler_base(const basic_yield_context<Executor>& yield)
+    : yield_(yield),
+      spawned_thread_(yield.spawned_thread_)
+  {
+    spawned_thread_->detach();
+#if !defined(BOOST_ASIO_HAS_MOVE)
+    spawned_thread_->attach(&spawned_thread_);
+#endif // !defined(BOOST_ASIO_HAS_MOVE)
+  }
 
-} // namespace detail
+#if defined(BOOST_ASIO_HAS_MOVE)
+
+  spawn_handler_base(spawn_handler_base&& other) BOOST_ASIO_NOEXCEPT
+    : yield_(other.yield_),
+      spawned_thread_(other.spawned_thread_)
+
+  {
+    other.spawned_thread_ = 0;
+  }
 
-#if !defined(GENERATING_DOCUMENTATION)
+#else // defined(BOOST_ASIO_HAS_MOVE)
 
-template <typename Handler, typename ReturnType>
-class async_result<basic_yield_context<Handler>, ReturnType()>
-  : public detail::coro_async_result<Handler, void>
+  spawn_handler_base(const spawn_handler_base& other) BOOST_ASIO_NOEXCEPT
+    : yield_(other.yield_),
+      spawned_thread_(other.spawned_thread_)
+  {
+    spawned_thread_->detach();
+    spawned_thread_->attach(&spawned_thread_);
+  }
+
+#endif // defined(BOOST_ASIO_HAS_MOVE)
+
+  ~spawn_handler_base()
+  {
+    if (spawned_thread_)
+      (post)(yield_.executor_, spawned_thread_destroyer(spawned_thread_));
+  }
+
+  executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+  {
+    return yield_.executor_;
+  }
+
+  cancellation_slot_type get_cancellation_slot() const BOOST_ASIO_NOEXCEPT
+  {
+    return spawned_thread_->get_cancellation_slot();
+  }
+
+  void resume()
+  {
+    spawned_thread_resumer resumer(spawned_thread_);
+    spawned_thread_ = 0;
+    resumer();
+  }
+
+protected:
+  const basic_yield_context<Executor>& yield_;
+  spawned_thread_base* spawned_thread_;
+};
+
+// Completion handlers for when basic_yield_context is used as a token.
+template <typename Executor, typename Signature>
+class spawn_handler;
+
+template <typename Executor, typename R>
+class spawn_handler<Executor, R()>
+  : public spawn_handler_base<Executor>
+{
+public:
+  typedef void return_type;
+
+  struct result_type {};
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type&)
+    : spawn_handler_base<Executor>(yield)
+  {
+  }
+
+  void operator()()
+  {
+    this->resume();
+  }
+
+  static return_type on_resume(result_type&)
+  {
+  }
+};
+
+template <typename Executor, typename R>
+class spawn_handler<Executor, R(boost::system::error_code)>
+  : public spawn_handler_base<Executor>
 {
 public:
-  explicit async_result(
-    typename detail::coro_async_result<Handler,
-      void>::completion_handler_type& h)
-    : detail::coro_async_result<Handler, void>(h)
+  typedef void return_type;
+  typedef boost::system::error_code* result_type;
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
   {
   }
+
+  void operator()(boost::system::error_code ec)
+  {
+    if (this->yield_.ec_)
+    {
+      *this->yield_.ec_ = ec;
+      result_ = 0;
+    }
+    else
+      result_ = &ec;
+    this->resume();
+  }
+
+  static return_type on_resume(result_type& result)
+  {
+    if (result)
+      throw_error(*result);
+  }
+
+private:
+  result_type& result_;
 };
 
-template <typename Handler, typename ReturnType, typename Arg1>
-class async_result<basic_yield_context<Handler>, ReturnType(Arg1)>
-  : public detail::coro_async_result<Handler, typename decay<Arg1>::type>
+template <typename Executor, typename R>
+class spawn_handler<Executor, R(exception_ptr)>
+  : public spawn_handler_base<Executor>
 {
 public:
-  explicit async_result(
-    typename detail::coro_async_result<Handler,
-      typename decay<Arg1>::type>::completion_handler_type& h)
-    : detail::coro_async_result<Handler, typename decay<Arg1>::type>(h)
+  typedef void return_type;
+  typedef exception_ptr* result_type;
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
+  {
+  }
+
+  void operator()(exception_ptr ex)
+  {
+    result_ = &ex;
+    this->resume();
+  }
+
+  static return_type on_resume(result_type& result)
   {
+    if (result)
+      rethrow_exception(*result);
   }
+
+private:
+  result_type& result_;
 };
 
-template <typename Handler, typename ReturnType>
-class async_result<basic_yield_context<Handler>,
-    ReturnType(boost::system::error_code)>
-  : public detail::coro_async_result<Handler, void>
+template <typename Executor, typename R, typename T>
+class spawn_handler<Executor, R(T)>
+  : public spawn_handler_base<Executor>
 {
 public:
-  explicit async_result(
-    typename detail::coro_async_result<Handler,
-      void>::completion_handler_type& h)
-    : detail::coro_async_result<Handler, void>(h)
+  typedef T return_type;
+  typedef return_type* result_type;
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
   {
   }
+
+  void operator()(T value)
+  {
+    result_ = &value;
+    this->resume();
+  }
+
+  static return_type on_resume(result_type& result)
+  {
+    return BOOST_ASIO_MOVE_CAST(return_type)(*result);
+  }
+
+private:
+  result_type& result_;
 };
 
-template <typename Handler, typename ReturnType, typename Arg2>
-class async_result<basic_yield_context<Handler>,
-    ReturnType(boost::system::error_code, Arg2)>
-  : public detail::coro_async_result<Handler, typename decay<Arg2>::type>
+template <typename Executor, typename R, typename T>
+class spawn_handler<Executor, R(boost::system::error_code, T)>
+  : public spawn_handler_base<Executor>
 {
 public:
-  explicit async_result(
-    typename detail::coro_async_result<Handler,
-      typename decay<Arg2>::type>::completion_handler_type& h)
-    : detail::coro_async_result<Handler, typename decay<Arg2>::type>(h)
+  typedef T return_type;
+
+  struct result_type
   {
+    boost::system::error_code* ec_;
+    return_type* value_;
+  };
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
+  {
+  }
+
+  void operator()(boost::system::error_code ec, T value)
+  {
+    if (this->yield_.ec_)
+    {
+      *this->yield_.ec_ = ec;
+      result_.ec_ = 0;
+    }
+    else
+      result_.ec_ = &ec;
+    result_.value_ = &value;
+    this->resume();
   }
+
+  static return_type on_resume(result_type& result)
+  {
+    if (result.ec_)
+      throw_error(*result.ec_);
+    return BOOST_ASIO_MOVE_CAST(return_type)(*result.value_);
+  }
+
+private:
+  result_type& result_;
 };
 
-template <template <typename, typename> class Associator,
-    typename Handler, typename T, typename DefaultCandidate>
-struct associator<Associator,
-    detail::coro_handler<Handler, T>,
-    DefaultCandidate>
-  : Associator<Handler, DefaultCandidate>
+template <typename Executor, typename R, typename T>
+class spawn_handler<Executor, R(exception_ptr, T)>
+  : public spawn_handler_base<Executor>
 {
-  static typename Associator<Handler, DefaultCandidate>::type get(
-      const detail::coro_handler<Handler, T>& h,
-      const DefaultCandidate& c = DefaultCandidate()) BOOST_ASIO_NOEXCEPT
+public:
+  typedef T return_type;
+
+  struct result_type
+  {
+    exception_ptr ex_;
+    return_type* value_;
+  };
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
   {
-    return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
+
+  void operator()(exception_ptr ex, T value)
+  {
+    result_.ex_ = &ex;
+    result_.value_ = &value;
+    this->resume();
+  }
+
+  static return_type on_resume(result_type& result)
+  {
+    if (result.ex_)
+      rethrow_exception(*result.ex_);
+    return BOOST_ASIO_MOVE_CAST(return_type)(*result.value_);
+  }
+
+private:
+  result_type& result_;
 };
 
-namespace detail {
+#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES) \
+  && defined(BOOST_ASIO_HAS_STD_TUPLE)
+
+template <typename Executor, typename R, typename... Ts>
+class spawn_handler<Executor, R(Ts...)>
+  : public spawn_handler_base<Executor>
+{
+public:
+  typedef std::tuple<Ts...> return_type;
+
+  typedef return_type* result_type;
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
+  {
+  }
+
+  template <typename... Args>
+  void operator()(BOOST_ASIO_MOVE_ARG(Args)... args)
+  {
+    return_type value(BOOST_ASIO_MOVE_CAST(Args)(args)...);
+    result_ = &value;
+    this->resume();
+  }
+
+  static return_type on_resume(result_type& result)
+  {
+    return BOOST_ASIO_MOVE_CAST(return_type)(*result);
+  }
+
+private:
+  result_type& result_;
+};
+
+template <typename Executor, typename R, typename... Ts>
+class spawn_handler<Executor, R(boost::system::error_code, Ts...)>
+  : public spawn_handler_base<Executor>
+{
+public:
+  typedef std::tuple<Ts...> return_type;
 
-  template <typename Handler, typename Function>
-  struct spawn_data : private noncopyable
+  struct result_type
   {
-    template <typename Hand, typename Func>
-    spawn_data(BOOST_ASIO_MOVE_ARG(Hand) handler,
-        bool call_handler, BOOST_ASIO_MOVE_ARG(Func) function)
-      : handler_(BOOST_ASIO_MOVE_CAST(Hand)(handler)),
-        call_handler_(call_handler),
-        function_(BOOST_ASIO_MOVE_CAST(Func)(function))
+    boost::system::error_code* ec_;
+    return_type* value_;
+  };
+
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
+  {
+  }
+
+  template <typename... Args>
+  void operator()(boost::system::error_code ec,
+      BOOST_ASIO_MOVE_ARG(Args)... args)
+  {
+    return_type value(BOOST_ASIO_MOVE_CAST(Args)(args)...);
+    if (this->yield_.ec_)
     {
+      *this->yield_.ec_ = ec;
+      result_.ec_ = 0;
     }
+    else
+      result_.ec_ = &ec;
+    result_.value_ = &value;
+    this->resume();
+  }
 
-    weak_ptr<typename basic_yield_context<Handler>::callee_type> coro_;
-    Handler handler_;
-    bool call_handler_;
-    Function function_;
+  static return_type on_resume(result_type& result)
+  {
+    if (result.ec_)
+      throw_error(*result.ec_);
+    return BOOST_ASIO_MOVE_CAST(return_type)(*result.value_);
+  }
+
+private:
+  result_type& result_;
+};
+
+template <typename Executor, typename R, typename... Ts>
+class spawn_handler<Executor, R(exception_ptr, Ts...)>
+  : public spawn_handler_base<Executor>
+{
+public:
+  typedef std::tuple<Ts...> return_type;
+
+  struct result_type
+  {
+    exception_ptr ex_;
+    return_type* value_;
   };
 
-  template <typename Handler, typename Function>
-  struct coro_entry_point
+  spawn_handler(const basic_yield_context<Executor>& yield, result_type& result)
+    : spawn_handler_base<Executor>(yield),
+      result_(result)
+  {
+  }
+
+  template <typename... Args>
+  void operator()(exception_ptr ex, BOOST_ASIO_MOVE_ARG(Args)... args)
   {
-    void operator()(typename basic_yield_context<Handler>::caller_type& ca)
+    return_type value(BOOST_ASIO_MOVE_CAST(Args)(args)...);
+    result_.ex_ = &ex;
+    result_.value_ = &value;
+    this->resume();
+  }
+
+  static return_type on_resume(result_type& result)
+  {
+    if (result.ex_)
+      rethrow_exception(*result.ex_);
+    return BOOST_ASIO_MOVE_CAST(return_type)(*result.value_);
+  }
+
+private:
+  result_type& result_;
+};
+
+#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
+       //   && defined(BOOST_ASIO_HAS_STD_TUPLE)
+
+template <typename Executor, typename Signature>
+inline bool asio_handler_is_continuation(spawn_handler<Executor, Signature>*)
+{
+  return true;
+}
+
+} // namespace detail
+
+template <typename Executor, typename Signature>
+class async_result<basic_yield_context<Executor>, Signature>
+{
+public:
+  typedef typename detail::spawn_handler<Executor, Signature> handler_type;
+  typedef typename handler_type::return_type return_type;
+
+#if defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
+# if defined(BOOST_ASIO_HAS_VARIADIC_LAMBDA_CAPTURES)
+
+  template <typename Initiation, typename... InitArgs>
+  static return_type initiate(BOOST_ASIO_MOVE_ARG(Initiation) init,
+      const basic_yield_context<Executor>& yield,
+      BOOST_ASIO_MOVE_ARG(InitArgs)... init_args)
+  {
+    typename handler_type::result_type result
+      = typename handler_type::result_type();
+
+    yield.spawned_thread_->suspend_with(
+        [&]()
+        {
+          BOOST_ASIO_MOVE_CAST(Initiation)(init)(
+              handler_type(yield, result),
+              BOOST_ASIO_MOVE_CAST(InitArgs)(init_args)...);
+        });
+
+    return handler_type::on_resume(result);
+  }
+
+# else // defined(BOOST_ASIO_HAS_VARIADIC_LAMBDA_CAPTURES)
+
+  template <typename Initiation, typename... InitArgs>
+  struct suspend_with_helper
+  {
+    typename handler_type::result_type& result_;
+    BOOST_ASIO_MOVE_ARG(Initiation) init_;
+    const basic_yield_context<Executor>& yield_;
+    std::tuple<BOOST_ASIO_MOVE_ARG(InitArgs)...> init_args_;
+
+    template <std::size_t... I>
+    void do_invoke(detail::index_sequence<I...>)
     {
-      shared_ptr<spawn_data<Handler, Function> > data(data_);
-#if !defined(BOOST_COROUTINES_UNIDIRECT) && !defined(BOOST_COROUTINES_V2)
-      ca(); // Yield until coroutine pointer has been initialised.
-#endif // !defined(BOOST_COROUTINES_UNIDIRECT) && !defined(BOOST_COROUTINES_V2)
-      const basic_yield_context<Handler> yield(
-          data->coro_, ca, data->handler_);
-
-      (data->function_)(yield);
-      if (data->call_handler_)
-        BOOST_ASIO_MOVE_OR_LVALUE(Handler)(data->handler_)();
+      BOOST_ASIO_MOVE_CAST(Initiation)(init_)(
+          handler_type(yield_, result_),
+          BOOST_ASIO_MOVE_CAST(InitArgs)(std::get<I>(init_args_))...);
     }
 
-    shared_ptr<spawn_data<Handler, Function> > data_;
+    void operator()()
+    {
+      this->do_invoke(detail::make_index_sequence<sizeof...(InitArgs)>());
+    }
   };
 
-  template <typename Handler, typename Function>
-  struct spawn_helper
+  template <typename Initiation, typename... InitArgs>
+  static return_type initiate(BOOST_ASIO_MOVE_ARG(Initiation) init,
+      const basic_yield_context<Executor>& yield,
+      BOOST_ASIO_MOVE_ARG(InitArgs)... init_args)
   {
-    typedef typename associated_allocator<Handler>::type allocator_type;
+    typename handler_type::result_type result
+      = typename handler_type::result_type();
 
-    allocator_type get_allocator() const BOOST_ASIO_NOEXCEPT
+    yield.spawned_thread_->suspend_with(
+      suspend_with_helper<Initiation, InitArgs...>{
+          result, BOOST_ASIO_MOVE_CAST(Initiation)(init), yield,
+          std::tuple<BOOST_ASIO_MOVE_ARG(InitArgs)...>(
+            BOOST_ASIO_MOVE_CAST(InitArgs)(init_args)...)});
+
+    return handler_type::on_resume(result);
+  }
+
+# endif // defined(BOOST_ASIO_HAS_VARIADIC_LAMBDA_CAPTURES)
+#else // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
+
+  template <typename Initiation>
+  static return_type initiate(Initiation init,
+      const basic_yield_context<Executor>& yield)
+  {
+    typename handler_type::result_type result
+      = typename handler_type::result_type();
+
+    struct on_suspend
     {
-      return (get_associated_allocator)(data_->handler_);
-    }
+      Initiation& init_;
+      const basic_yield_context<Executor>& yield_;
+      typename handler_type::result_type& result_;
 
-    typedef typename associated_executor<Handler>::type executor_type;
+      void do_call()
+      {
+        BOOST_ASIO_MOVE_CAST(Initiation)(init_)(
+            handler_type(yield_, result_));
+      }
+
+      static void call(void* arg)
+      {
+        static_cast<on_suspend*>(arg)->do_call();
+      }
+    } o = { init, yield, result };
+
+    yield.spawned_thread_->suspend_with(&on_suspend::call, &o);
+
+    return handler_type::on_resume(result);
+  }
+
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS(n) \
+  BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_##n
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_1 \
+  T1& x1;
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_2 \
+  T1& x1; T2& x2;
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_3 \
+  T1& x1; T2& x2; T3& x3;
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_4 \
+  T1& x1; T2& x2; T3& x3; T4& x4;
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_5 \
+  T1& x1; T2& x2; T3& x3; T4& x4; T5& x5;
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_6 \
+  T1& x1; T2& x2; T3& x3; T4& x4; T5& x5; T6& x6;
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_7 \
+  T1& x1; T2& x2; T3& x3; T4& x4; T5& x5; T6& x6; T7& x7;
+#define BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_8 \
+  T1& x1; T2& x2; T3& x3; T4& x4; T5& x5; T6& x6; T7& x7; T8& x8;
+
+#define BOOST_ASIO_PRIVATE_INITIATE_DEF(n) \
+  template <typename Initiation, BOOST_ASIO_VARIADIC_TPARAMS(n)> \
+  static return_type initiate(Initiation init, \
+      const basic_yield_context<Executor>& yield, \
+      BOOST_ASIO_VARIADIC_BYVAL_PARAMS(n)) \
+  { \
+    typename handler_type::result_type result \
+      = typename handler_type::result_type(); \
+  \
+    struct on_suspend \
+    { \
+      Initiation& init; \
+      const basic_yield_context<Executor>& yield; \
+      typename handler_type::result_type& result; \
+      BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS(n) \
+  \
+      void do_call() \
+      { \
+        BOOST_ASIO_MOVE_CAST(Initiation)(init)( \
+            handler_type(yield, result), \
+            BOOST_ASIO_VARIADIC_MOVE_ARGS(n)); \
+      } \
+  \
+      static void call(void* arg) \
+      { \
+        static_cast<on_suspend*>(arg)->do_call(); \
+      } \
+    } o = { init, yield, result, BOOST_ASIO_VARIADIC_BYVAL_ARGS(n) }; \
+  \
+    yield.spawned_thread_->suspend_with(&on_suspend::call, &o); \
+  \
+    return handler_type::on_resume(result); \
+  } \
+  /**/
+  BOOST_ASIO_VARIADIC_GENERATE(BOOST_ASIO_PRIVATE_INITIATE_DEF)
+#undef BOOST_ASIO_PRIVATE_INITIATE_DEF
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_1
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_2
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_3
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_4
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_5
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_6
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_7
+#undef BOOST_ASIO_PRIVATE_ON_SUSPEND_MEMBERS_8
+
+#endif // defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)
+};
 
-    executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+namespace detail {
+
+template <typename Executor, typename Function, typename Handler>
+class spawn_entry_point
+{
+public:
+  template <typename F, typename H>
+  spawn_entry_point(const Executor& ex,
+      BOOST_ASIO_MOVE_ARG(F) f, BOOST_ASIO_MOVE_ARG(H) h)
+    : executor_(ex),
+      function_(BOOST_ASIO_MOVE_CAST(F)(f)),
+      handler_(BOOST_ASIO_MOVE_CAST(H)(h))
+  {
+  }
+
+  void operator()(spawned_thread_base* spawned_thread)
+  {
+    const basic_yield_context<Executor> yield(spawned_thread, executor_);
+    this->call(yield,
+        void_type<typename result_of<Function(
+          basic_yield_context<Executor>)>::type>());
+  }
+
+private:
+  void call(const basic_yield_context<Executor>& yield, void_type<void>)
+  {
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
+    try
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
+    {
+      function_(yield);
+      if (!yield.spawned_thread_->has_context_switched())
+        (post)(yield);
+      BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(exception_ptr());
+    }
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
+# if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+    catch (const boost::context::detail::forced_unwind&)
+    {
+      throw;
+    }
+# endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+# if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    catch (const boost::coroutines::detail::forced_unwind&)
     {
-      return (get_associated_executor)(data_->handler_);
+      throw;
     }
+# endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    catch (...)
+    {
+      exception_ptr ex = current_exception();
+      if (!yield.spawned_thread_->has_context_switched())
+        (post)(yield);
+      BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(ex);
+    }
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
+  }
 
-    void operator()()
+  template <typename T>
+  void call(const basic_yield_context<Executor>& yield, void_type<T>)
+  {
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
+    try
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
+    {
+      T result(function_(yield));
+      if (!yield.spawned_thread_->has_context_switched())
+        (post)(yield);
+      BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
+          exception_ptr(), BOOST_ASIO_MOVE_CAST(T)(result));
+    }
+#if !defined(BOOST_ASIO_NO_EXCEPTIONS)
+# if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+    catch (const boost::context::detail::forced_unwind&)
     {
-      typedef typename basic_yield_context<Handler>::callee_type callee_type;
-      coro_entry_point<Handler, Function> entry_point = { data_ };
-      shared_ptr<callee_type> coro(new callee_type(entry_point, attributes_));
-      data_->coro_ = coro;
-      (*coro)();
+      throw;
     }
+# endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+# if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    catch (const boost::coroutines::detail::forced_unwind&)
+    {
+      throw;
+    }
+# endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    catch (...)
+    {
+      exception_ptr ex = current_exception();
+      if (!yield.spawned_thread_->has_context_switched())
+        (post)(yield);
+      BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(ex, T());
+    }
+#endif // !defined(BOOST_ASIO_NO_EXCEPTIONS)
+  }
 
-    shared_ptr<spawn_data<Handler, Function> > data_;
-    boost::coroutines::attributes attributes_;
-  };
+  Executor executor_;
+  Function function_;
+  Handler handler_;
+};
+
+struct spawn_cancellation_signal_emitter
+{
+  cancellation_signal* signal_;
+  cancellation_type_t type_;
 
-  template <typename Function, typename Handler, typename Function1>
-  inline asio_handler_invoke_is_deprecated
-  asio_handler_invoke(Function& function,
-      spawn_helper<Handler, Function1>* this_handler)
+  void operator()()
   {
-    boost_asio_handler_invoke_helpers::invoke(
-        function, this_handler->data_->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-    return asio_handler_invoke_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
+    signal_->emit(type_);
   }
+};
 
-  template <typename Function, typename Handler, typename Function1>
-  inline asio_handler_invoke_is_deprecated
-  asio_handler_invoke(const Function& function,
-      spawn_helper<Handler, Function1>* this_handler)
+template <typename Handler, typename Executor, typename = void>
+class spawn_cancellation_handler
+{
+public:
+  spawn_cancellation_handler(const Handler& handler, const Executor& ex)
+    : ex_(boost::asio::get_associated_executor(handler, ex))
   {
-    boost_asio_handler_invoke_helpers::invoke(
-        function, this_handler->data_->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-    return asio_handler_invoke_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
   }
 
-  inline void default_spawn_handler() {}
+  cancellation_slot slot()
+  {
+    return signal_.slot();
+  }
+
+  void operator()(cancellation_type_t type)
+  {
+    spawn_cancellation_signal_emitter emitter = { &signal_, type };
+    (dispatch)(ex_, emitter);
+  }
+
+private:
+  cancellation_signal signal_;
+  typename associated_executor<Handler, Executor>::type ex_;
+};
+
+
+template <typename Handler, typename Executor>
+class spawn_cancellation_handler<Handler, Executor,
+    typename enable_if<
+      is_same<
+        typename associated_executor<Handler,
+          Executor>::asio_associated_executor_is_unspecialised,
+        void
+      >::value
+    >::type>
+{
+public:
+  spawn_cancellation_handler(const Handler&, const Executor&)
+  {
+  }
+
+  cancellation_slot slot()
+  {
+    return signal_.slot();
+  }
+
+  void operator()(cancellation_type_t type)
+  {
+    signal_.emit(type);
+  }
+
+private:
+  cancellation_signal signal_;
+};
+
+template <typename Executor>
+class initiate_spawn
+{
+public:
+  typedef Executor executor_type;
+
+  explicit initiate_spawn(const executor_type& ex)
+    : executor_(ex)
+  {
+  }
+
+  executor_type get_executor() const BOOST_ASIO_NOEXCEPT
+  {
+    return executor_;
+  }
+
+  template <typename Handler, typename F>
+  void operator()(BOOST_ASIO_MOVE_ARG(Handler) handler,
+      BOOST_ASIO_MOVE_ARG(F) f) const
+  {
+    typedef typename decay<Handler>::type handler_type;
+    typedef typename decay<F>::type function_type;
+    typedef spawn_cancellation_handler<
+      handler_type, Executor> cancel_handler_type;
+
+    typename associated_cancellation_slot<handler_type>::type slot
+      = boost::asio::get_associated_cancellation_slot(handler);
+
+    cancel_handler_type* cancel_handler = slot.is_connected()
+      ? &slot.template emplace<cancel_handler_type>(handler, executor_)
+      : 0;
+
+    cancellation_slot proxy_slot(
+        cancel_handler
+          ? cancel_handler->slot()
+          : cancellation_slot());
+
+    cancellation_state cancel_state(proxy_slot);
+
+    (dispatch)(executor_,
+        spawned_thread_resumer(
+          default_spawned_thread_type::spawn(
+            spawn_entry_point<Executor, function_type, handler_type>(
+              executor_, BOOST_ASIO_MOVE_CAST(F)(f),
+              BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+            proxy_slot, cancel_state)));
+  }
+
+#if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+
+  template <typename Handler, typename StackAllocator, typename F>
+  void operator()(BOOST_ASIO_MOVE_ARG(Handler) handler, allocator_arg_t,
+      BOOST_ASIO_MOVE_ARG(StackAllocator) stack_allocator,
+      BOOST_ASIO_MOVE_ARG(F) f) const
+  {
+    typedef typename decay<Handler>::type handler_type;
+    typedef typename decay<F>::type function_type;
+    typedef spawn_cancellation_handler<
+      handler_type, Executor> cancel_handler_type;
+
+    typename associated_cancellation_slot<handler_type>::type slot
+      = boost::asio::get_associated_cancellation_slot(handler);
+
+    cancel_handler_type* cancel_handler = slot.is_connected()
+      ? &slot.template emplace<cancel_handler_type>(handler, executor_)
+      : 0;
+
+    cancellation_slot proxy_slot(
+        cancel_handler
+          ? cancel_handler->slot()
+          : cancellation_slot());
+
+    cancellation_state cancel_state(proxy_slot);
+
+    (dispatch)(executor_,
+        spawned_thread_resumer(
+          spawned_fiber_thread::spawn(allocator_arg_t(),
+            BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+            spawn_entry_point<Executor, function_type, handler_type>(
+              executor_, BOOST_ASIO_MOVE_CAST(F)(f),
+              BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+            proxy_slot, cancel_state)));
+  }
+
+#endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+
+private:
+  executor_type executor_;
+};
+
+} // namespace detail
+
+template <typename Executor, typename F,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+        CompletionToken>
+inline BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+spawn(const Executor& ex, BOOST_ASIO_MOVE_ARG(F) function,
+    BOOST_ASIO_MOVE_ARG(CompletionToken) token,
+#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    typename constraint<
+      !is_same<
+        typename decay<CompletionToken>::type,
+        boost::coroutines::attributes
+      >::value
+    >::type,
+#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    typename constraint<
+      is_executor<Executor>::value || execution::is_executor<Executor>::value
+    >::type)
+  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+    async_initiate<CompletionToken,
+      typename detail::spawn_signature<
+        typename result_of<F(basic_yield_context<Executor>)>::type>::type>(
+          declval<detail::initiate_spawn<Executor> >(),
+          token, BOOST_ASIO_MOVE_CAST(F)(function))))
+{
+  return async_initiate<CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type>(
+        detail::initiate_spawn<Executor>(ex),
+        token, BOOST_ASIO_MOVE_CAST(F)(function));
+}
+
+template <typename ExecutionContext, typename F,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<
+        typename ExecutionContext::executor_type>)>::type>::type)
+          CompletionToken>
+inline BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<
+        typename ExecutionContext::executor_type>)>::type>::type)
+spawn(ExecutionContext& ctx, BOOST_ASIO_MOVE_ARG(F) function,
+    BOOST_ASIO_MOVE_ARG(CompletionToken) token,
+#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    typename constraint<
+      !is_same<
+        typename decay<CompletionToken>::type,
+        boost::coroutines::attributes
+      >::value
+    >::type,
+#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    typename constraint<
+      is_convertible<ExecutionContext&, execution_context&>::value
+    >::type)
+  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+    async_initiate<CompletionToken,
+      typename detail::spawn_signature<
+        typename result_of<F(basic_yield_context<
+          typename ExecutionContext::executor_type>)>::type>::type>(
+            declval<detail::initiate_spawn<
+              typename ExecutionContext::executor_type> >(),
+            token, BOOST_ASIO_MOVE_CAST(F)(function))))
+{
+  return (spawn)(ctx.get_executor(), BOOST_ASIO_MOVE_CAST(F)(function),
+      BOOST_ASIO_MOVE_CAST(CompletionToken)(token));
+}
+
+template <typename Executor, typename F,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+        CompletionToken>
+inline BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+spawn(const basic_yield_context<Executor>& ctx,
+    BOOST_ASIO_MOVE_ARG(F) function,
+    BOOST_ASIO_MOVE_ARG(CompletionToken) token,
+#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    typename constraint<
+      !is_same<
+        typename decay<CompletionToken>::type,
+        boost::coroutines::attributes
+      >::value
+    >::type,
+#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+    typename constraint<
+      is_executor<Executor>::value || execution::is_executor<Executor>::value
+    >::type)
+  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+    async_initiate<CompletionToken,
+      typename detail::spawn_signature<
+        typename result_of<F(basic_yield_context<Executor>)>::type>::type>(
+          declval<detail::initiate_spawn<Executor> >(),
+          token, BOOST_ASIO_MOVE_CAST(F)(function))))
+{
+  return (spawn)(ctx.get_executor(), BOOST_ASIO_MOVE_CAST(F)(function),
+      BOOST_ASIO_MOVE_CAST(CompletionToken)(token));
+}
+
+#if defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+
+template <typename Executor, typename StackAllocator, typename F,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+        CompletionToken>
+inline BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+spawn(const Executor& ex, allocator_arg_t,
+    BOOST_ASIO_MOVE_ARG(StackAllocator) stack_allocator,
+    BOOST_ASIO_MOVE_ARG(F) function,
+    BOOST_ASIO_MOVE_ARG(CompletionToken) token,
+    typename constraint<
+      is_executor<Executor>::value || execution::is_executor<Executor>::value
+    >::type)
+  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+    async_initiate<CompletionToken,
+      typename detail::spawn_signature<
+        typename result_of<F(basic_yield_context<Executor>)>::type>::type>(
+          declval<detail::initiate_spawn<Executor> >(),
+          token, allocator_arg_t(),
+          BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+          BOOST_ASIO_MOVE_CAST(F)(function))))
+{
+  return async_initiate<CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type>(
+        detail::initiate_spawn<Executor>(ex), token, allocator_arg_t(),
+        BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+        BOOST_ASIO_MOVE_CAST(F)(function));
+}
+
+template <typename ExecutionContext, typename StackAllocator, typename F,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<
+        typename ExecutionContext::executor_type>)>::type>::type)
+          CompletionToken>
+inline BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<
+        typename ExecutionContext::executor_type>)>::type>::type)
+spawn(ExecutionContext& ctx, allocator_arg_t,
+    BOOST_ASIO_MOVE_ARG(StackAllocator) stack_allocator,
+    BOOST_ASIO_MOVE_ARG(F) function,
+    BOOST_ASIO_MOVE_ARG(CompletionToken) token,
+    typename constraint<
+      is_convertible<ExecutionContext&, execution_context&>::value
+    >::type)
+  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+    async_initiate<CompletionToken,
+      typename detail::spawn_signature<
+        typename result_of<F(basic_yield_context<
+          typename ExecutionContext::executor_type>)>::type>::type>(
+            declval<detail::initiate_spawn<
+              typename ExecutionContext::executor_type> >(),
+            token, allocator_arg_t(),
+            BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+            BOOST_ASIO_MOVE_CAST(F)(function))))
+{
+  return (spawn)(ctx.get_executor(), allocator_arg_t(),
+      BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+      BOOST_ASIO_MOVE_CAST(F)(function),
+      BOOST_ASIO_MOVE_CAST(CompletionToken)(token));
+}
+
+template <typename Executor, typename StackAllocator, typename F,
+    BOOST_ASIO_COMPLETION_TOKEN_FOR(typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+        CompletionToken>
+inline BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(CompletionToken,
+    typename detail::spawn_signature<
+      typename result_of<F(basic_yield_context<Executor>)>::type>::type)
+spawn(const basic_yield_context<Executor>& ctx, allocator_arg_t,
+    BOOST_ASIO_MOVE_ARG(StackAllocator) stack_allocator,
+    BOOST_ASIO_MOVE_ARG(F) function,
+    BOOST_ASIO_MOVE_ARG(CompletionToken) token,
+    typename constraint<
+      is_executor<Executor>::value || execution::is_executor<Executor>::value
+    >::type)
+  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+    async_initiate<CompletionToken,
+      typename detail::spawn_signature<
+        typename result_of<F(basic_yield_context<Executor>)>::type>::type>(
+          declval<detail::initiate_spawn<Executor> >(),
+          token, allocator_arg_t(),
+          BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+          BOOST_ASIO_MOVE_CAST(F)(function))))
+{
+  return (spawn)(ctx.get_executor(), allocator_arg_t(),
+      BOOST_ASIO_MOVE_CAST(StackAllocator)(stack_allocator),
+      BOOST_ASIO_MOVE_CAST(F)(function),
+      BOOST_ASIO_MOVE_CAST(CompletionToken)(token));
+}
+
+#endif // defined(BOOST_ASIO_HAS_BOOST_CONTEXT_FIBER)
+
+#if defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
+
+namespace detail {
+
+template <typename Executor, typename Function, typename Handler>
+class old_spawn_entry_point
+{
+public:
+  template <typename F, typename H>
+  old_spawn_entry_point(const Executor& ex,
+      BOOST_ASIO_MOVE_ARG(F) f, BOOST_ASIO_MOVE_ARG(H) h)
+    : executor_(ex),
+      function_(BOOST_ASIO_MOVE_CAST(F)(f)),
+      handler_(BOOST_ASIO_MOVE_CAST(H)(h))
+  {
+  }
+
+  void operator()(spawned_thread_base* spawned_thread)
+  {
+    const basic_yield_context<Executor> yield(spawned_thread, executor_);
+    this->call(yield,
+        void_type<typename result_of<Function(
+          basic_yield_context<Executor>)>::type>());
+  }
+
+private:
+  void call(const basic_yield_context<Executor>& yield, void_type<void>)
+  {
+    function_(yield);
+    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)();
+  }
+
+  template <typename T>
+  void call(const basic_yield_context<Executor>& yield, void_type<T>)
+  {
+    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(function_(yield));
+  }
+
+  Executor executor_;
+  Function function_;
+  Handler handler_;
+};
+
+inline void default_spawn_handler() {}
 
 } // namespace detail
 
@@ -432,34 +1477,33 @@ void spawn(BOOST_ASIO_MOVE_ARG(Handler) handler,
 {
   typedef typename decay<Handler>::type handler_type;
   typedef typename decay<Function>::type function_type;
+  typedef typename associated_executor<handler_type>::type executor_type;
 
-  detail::spawn_helper<handler_type, function_type> helper;
-  helper.data_.reset(
-      new detail::spawn_data<handler_type, function_type>(
-        BOOST_ASIO_MOVE_CAST(Handler)(handler), true,
-        BOOST_ASIO_MOVE_CAST(Function)(function)));
-  helper.attributes_ = attributes;
+  executor_type ex((get_associated_executor)(handler));
 
-  boost::asio::dispatch(helper);
+  (dispatch)(ex,
+      detail::spawned_thread_resumer(
+        detail::spawned_coroutine_thread::spawn(
+          detail::old_spawn_entry_point<executor_type,
+            function_type, void (*)()>(
+              ex, BOOST_ASIO_MOVE_CAST(Function)(function),
+              &detail::default_spawn_handler), attributes)));
 }
 
-template <typename Handler, typename Function>
-void spawn(basic_yield_context<Handler> ctx,
+template <typename Executor, typename Function>
+void spawn(basic_yield_context<Executor> ctx,
     BOOST_ASIO_MOVE_ARG(Function) function,
     const boost::coroutines::attributes& attributes)
 {
   typedef typename decay<Function>::type function_type;
 
-  Handler handler(ctx.handler_); // Explicit copy that might be moved from.
-
-  detail::spawn_helper<Handler, function_type> helper;
-  helper.data_.reset(
-      new detail::spawn_data<Handler, function_type>(
-        BOOST_ASIO_MOVE_CAST(Handler)(handler), false,
-        BOOST_ASIO_MOVE_CAST(Function)(function)));
-  helper.attributes_ = attributes;
-
-  boost::asio::dispatch(helper);
+  (dispatch)(ctx.get_executor(),
+      detail::spawned_thread_resumer(
+        detail::spawned_coroutine_thread::spawn(
+          detail::old_spawn_entry_point<Executor,
+            function_type, void (*)()>(ctx.get_executor(),
+              BOOST_ASIO_MOVE_CAST(Function)(function),
+              &detail::default_spawn_handler), attributes)));
 }
 
 template <typename Function, typename Executor>
@@ -509,7 +1553,7 @@ inline void spawn(ExecutionContext& ctx,
       BOOST_ASIO_MOVE_CAST(Function)(function), attributes);
 }
 
-#endif // !defined(GENERATING_DOCUMENTATION)
+#endif // defined(BOOST_ASIO_HAS_BOOST_COROUTINE)
 
 } // namespace asio
 } // namespace boost