From 89f1e584145e72b892c1409b89cfae9b544405af Mon Sep 17 00:00:00 2001
From: Robert Leahy <rleahy@rleahy.ca>
Date: Tue, 30 Dec 2025 19:41:21 -0500
Subject: [PATCH] stdexec::stoppable_token & ::stop_token_for_t: Support
 std::stop_token

Both the stdexec::stoppable_token concept and the stdexec::
stop_token_for_t template type alias depend on the stop token type
having a unary member template named callback_type. While P2300 added
the aforementioned member template to std::stop_token that means that
before C++26 the aforementioned utilities don't work therewith.

Special cased:

- stdexec::stoppable_token to allow std::stop_token without checking for
  the above-mentioned member template, and
- stdexec::stop_token_t to resolve to std::stop_callback<Callback> when
  its first template argument is std::stop_token
---
 include/stdexec/__detail/__stop_token.hpp     | 20 +++++++--
 test/CMakeLists.txt                           |  1 +
 .../concepts/test_concepts_stop_tokens.cpp    | 43 +++++++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 test/stdexec/concepts/test_concepts_stop_tokens.cpp

diff --git a/include/stdexec/__detail/__stop_token.hpp b/include/stdexec/__detail/__stop_token.hpp
index e4df4fa41..d0bafa7fa 100644
--- a/include/stdexec/__detail/__stop_token.hpp
+++ b/include/stdexec/__detail/__stop_token.hpp
@@ -20,6 +20,8 @@
 
 #include "__concepts.hpp"
 
+#include <stop_token>
+
 namespace stdexec {
   namespace __stok {
     template <template <class> class>
@@ -27,7 +29,16 @@ namespace stdexec {
   } // namespace __stok
 
   template <class _Token, class _Callback>
-  using stop_callback_for_t = _Token::template callback_type<_Callback>;
+  struct __stop_callback_for {
+    using __t = _Token::template callback_type<_Callback>;
+  };
+  template <class _Callback>
+  struct __stop_callback_for<std::stop_token, _Callback> {
+    using __t = std::stop_callback<_Callback>;
+  };
+
+  template <class _Token, class _Callback>
+  using stop_callback_for_t = __stop_callback_for<_Token, _Callback>::__t;
 
   template <class _Token>
   concept stoppable_token =
@@ -35,11 +46,14 @@ namespace stdexec {
     && equality_comparable<_Token> && requires(const _Token& __token) {
          { __token.stop_requested() } noexcept -> __boolean_testable_;
          { __token.stop_possible() } noexcept -> __boolean_testable_;
-    // workaround ICE in appleclang 13.1
+       }
+  // workaround ICE in appleclang 13.1
 #if !defined(__clang__)
+       && (__same_as<_Token, std::stop_token> || requires {
          typename __stok::__check_type_alias_exists<_Token::template callback_type>;
+       })
 #endif
-       };
+      ;
 
   template <class _Token, typename _Callback, typename _Initializer = _Callback>
   concept stoppable_token_for =
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f403432e9..d9b273d78 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,6 +29,7 @@ set(stdexec_test_sources
     stdexec/concepts/test_concepts_receiver.cpp
     stdexec/concepts/test_concept_operation_state.cpp
     stdexec/concepts/test_concepts_sender.cpp
+    stdexec/concepts/test_concepts_stop_tokens.cpp
     stdexec/concepts/test_awaitables.cpp
     stdexec/algos/factories/test_just.cpp
     stdexec/algos/factories/test_transfer_just.cpp
diff --git a/test/stdexec/concepts/test_concepts_stop_tokens.cpp b/test/stdexec/concepts/test_concepts_stop_tokens.cpp
new file mode 100644
index 000000000..ce9b1b857
--- /dev/null
+++ b/test/stdexec/concepts/test_concepts_stop_tokens.cpp
@@ -0,0 +1,43 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ *                         Copyright (c) 2025 Robert Leahy. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ * Licensed under the Apache License, Version 2.0 with LLVM Exceptions (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://llvm.org/LICENSE.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdexec/execution.hpp>
+
+#include <stop_token>
+#include <type_traits>
+
+namespace {
+
+  struct on_stop_request {
+    void operator()() && noexcept {
+    }
+  };
+
+  static_assert(::stdexec::stoppable_token<::stdexec::never_stop_token>);
+  static_assert(::stdexec::unstoppable_token<::stdexec::never_stop_token>);
+  static_assert(::stdexec::stoppable_token<::stdexec::inplace_stop_token>);
+  static_assert(!::stdexec::unstoppable_token<::stdexec::inplace_stop_token>);
+  static_assert(std::is_same_v<
+                ::stdexec::stop_callback_for_t<::stdexec::never_stop_token, on_stop_request>,
+                ::stdexec::never_stop_token::callback_type<on_stop_request>>);
+  static_assert(::stdexec::stoppable_token<std::stop_token>);
+  static_assert(std::is_same_v<
+                ::stdexec::stop_callback_for_t<std::stop_token, on_stop_request>,
+                std::stop_callback<on_stop_request>>);
+
+} // namespace