From 966a24cbbe00eb8c06e480855d3ae5ccd18c7d7e Mon Sep 17 00:00:00 2001
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Tue, 25 Jun 2024 22:39:51 +1000
Subject: [PATCH] Change redirect_error to propagate an initiation object's
 executor.

---
 asio/include/asio/impl/redirect_error.hpp | 37 +++++++++++++----------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/asio/include/asio/impl/redirect_error.hpp b/asio/include/asio/impl/redirect_error.hpp
index a82e6afe14..29d55cbe52 100644
--- a/asio/include/asio/impl/redirect_error.hpp
+++ b/asio/include/asio/impl/redirect_error.hpp
@@ -20,6 +20,7 @@
 #include "asio/associator.hpp"
 #include "asio/async_result.hpp"
 #include "asio/detail/handler_cont_helpers.hpp"
+#include "asio/detail/initiation_base.hpp"
 #include "asio/detail/type_traits.hpp"
 #include "asio/system_error.hpp"
 
@@ -183,25 +184,30 @@ struct async_result<redirect_error_t<CompletionToken>, Signature>
   : async_result<CompletionToken,
       typename detail::redirect_error_signature<Signature>::type>
 {
-
-  struct init_wrapper
+  template <typename Initiation>
+  struct init_wrapper : detail::initiation_base<Initiation>
   {
-    explicit init_wrapper(asio::error_code& ec)
-      : ec_(ec)
+    using detail::initiation_base<Initiation>::initiation_base;
+
+    template <typename Handler, typename... Args>
+    void operator()(Handler&& handler,
+        asio::error_code* ec, Args&&... args) &&
     {
+      static_cast<Initiation&&>(*this)(
+          detail::redirect_error_handler<decay_t<Handler>>(
+            *ec, static_cast<Handler&&>(handler)),
+          static_cast<Args&&>(args)...);
     }
 
-    template <typename Handler, typename Initiation, typename... Args>
+    template <typename Handler, typename... Args>
     void operator()(Handler&& handler,
-        Initiation&& initiation, Args&&... args) const
+        asio::error_code* ec, Args&&... args) const &
     {
-      static_cast<Initiation&&>(initiation)(
+      static_cast<const Initiation&>(*this)(
           detail::redirect_error_handler<decay_t<Handler>>(
-            ec_, static_cast<Handler&&>(handler)),
+            *ec, static_cast<Handler&&>(handler)),
           static_cast<Args&&>(args)...);
     }
-
-    asio::error_code& ec_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
@@ -213,18 +219,17 @@ struct async_result<redirect_error_t<CompletionToken>, Signature>
           is_const<remove_reference_t<RawCompletionToken>>::value,
             const CompletionToken, CompletionToken>,
         typename detail::redirect_error_signature<Signature>::type>(
-          declval<init_wrapper>(), token.token_,
-          static_cast<Initiation&&>(initiation),
-          static_cast<Args&&>(args)...))
+          declval<init_wrapper<decay_t<Initiation>>>(),
+          token.token_, &token.ec_, static_cast<Args&&>(args)...))
   {
     return async_initiate<
       conditional_t<
         is_const<remove_reference_t<RawCompletionToken>>::value,
           const CompletionToken, CompletionToken>,
       typename detail::redirect_error_signature<Signature>::type>(
-        init_wrapper(token.ec_), token.token_,
-        static_cast<Initiation&&>(initiation),
-        static_cast<Args&&>(args)...);
+        init_wrapper<decay_t<Initiation>>(
+          static_cast<Initiation&&>(initiation)),
+        token.token_, &token.ec_, static_cast<Args&&>(args)...);
   }
 };