fix problems exposed by eschewing static_get_completion_signatures members

ericniebler · ericniebler · commit 9d4cf6486ced · 2025-12-19T10:07:07.000-08:00
diff --git a/.clangd b/.clangd
@@ -80,6 +80,7 @@ CompileFlags:
     - -profiler
     - -ignore-system
     - "-fconcepts-diagnostics-depth=*"
+    - "-gopt"
 Diagnostics:
   Suppress:
     - "variadic_device_fn"
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -74,15 +74,15 @@
             "args": "-v normal ${input:CUDA_TEST_TAGS}",
         },
         {
-            "name": "maxwell_gpu_s (cuda-gdb)",
+            "name": "maxwell_cpu_st (cuda-gdb)",
             "type": "cuda-gdb",
             "request": "launch",
             "stopAtEntry": false,
             "breakOnLaunch": false,
             "internalConsoleOptions": "openOnFirstSessionStart",
-            "program": "${command:cmake.buildDirectory}/examples/nvexec/maxwell_gpu_s",
+            "program": "${command:cmake.buildDirectory}/examples/nvexec/maxwell_cpu_st",
             "cwd": "${command:cmake.buildDirectory}",
-            "args": ["--iterations=1000", "--N=512", "--run-cuda", "--run-stdpar", "--run-stream-scheduler"],
+            "args": ["--iterations=1000", "--N=512", "--run-cpp", "--run-inline-scheduler"],
         },
     ],
     "inputs": [
diff --git a/examples/nvexec/maxwell/common.cuh b/examples/nvexec/maxwell/common.cuh
@@ -56,7 +56,6 @@ struct deleter_t {
 };
 
 template <class T>
-STDEXEC_ATTRIBUTE(host, device)
 inline auto allocate_on(bool gpu, std::size_t elements = 1) -> std::unique_ptr<T, deleter_t> {
   T *ptr{};
 
diff --git a/examples/nvexec/maxwell_cpu_mt.cu b/examples/nvexec/maxwell_cpu_mt.cu
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// This file causes clangd to crash during parsing
+#if !defined(STDEXEC_CLANGD_INVOKED)
+
 #include "maxwell/snr.cuh"
 #include "maxwell/std.cuh"
 #include "maxwell/stdpar.cuh" // IWYU pragma: keep
@@ -85,3 +88,5 @@ auto main(int argc, char *argv[]) -> int {
   }
 #endif
 }
+
+#endif // !defined(STDEXEC_CLANGD_INVOKED)
diff --git a/examples/nvexec/maxwell_cpu_st.cu b/examples/nvexec/maxwell_cpu_st.cu
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// This file causes clangd to crash during parsing
+#if !defined(STDEXEC_CLANGD_INVOKED)
+
 #include "maxwell/snr.cuh"
 #include "maxwell/cpp.cuh"
 
@@ -65,3 +68,5 @@ auto main(int argc, char *argv[]) -> int {
     run_cpp(dt, write_vtk, n_iterations, grid, "CPU (cpp)");
   }
 }
+
+#endif // !defined(STDEXEC_CLANGD_INVOKED)
diff --git a/examples/nvexec/maxwell_distributed.cu b/examples/nvexec/maxwell_distributed.cu
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// This file causes clangd to crash during parsing
+#if !defined(STDEXEC_CLANGD_INVOKED)
+
 #include "maxwell/snr.cuh"           // IWYU pragma: keep
 #include "nvexec/stream_context.cuh" // IWYU pragma: keep
 
@@ -512,7 +515,7 @@ auto main(int argc, char *argv[]) -> int {
   }
 
   write();
-#  else
+#  else // ^^ defined(OVERLAP) ^^ // vv !defined(OVERLAP) vv
   for (std::size_t compute_step = 0; compute_step < n_iterations; compute_step++) {
     auto compute_h =
       ex::just()
@@ -531,7 +534,7 @@ auto main(int argc, char *argv[]) -> int {
   }
 
   write();
-#  endif
+#  endif // defined(OVERLAP)
 
   MPI_Barrier(MPI_COMM_WORLD);
   const auto end = std::chrono::system_clock::now();
@@ -550,3 +553,5 @@ auto main(int argc, char *argv[]) -> int {
   MPI_Finalize();
 }
 #endif
+
+#endif // !defined(STDEXEC_CLANGD_INVOKED)
diff --git a/examples/nvexec/maxwell_gpu_m.cu b/examples/nvexec/maxwell_gpu_m.cu
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// This file causes clangd to crash during parsing
+#if !defined(STDEXEC_CLANGD_INVOKED)
+
 #include "maxwell/snr.cuh"
 
 auto main(int argc, char *argv[]) -> int {
@@ -52,3 +55,5 @@ auto main(int argc, char *argv[]) -> int {
   nvexec::multi_gpu_stream_context stream_context{};
   run_snr_on("GPU (multi-GPU)", stream_context.get_scheduler());
 }
+
+#endif // !defined(STDEXEC_CLANGD_INVOKED)
diff --git a/examples/nvexec/maxwell_gpu_s.cu b/examples/nvexec/maxwell_gpu_s.cu
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// This file causes clangd to crash during parsing
+#if !defined(STDEXEC_CLANGD_INVOKED)
+
 #include "maxwell/snr.cuh"
 #include "maxwell/stdpar.cuh" // IWYU pragma: keep
 #include "maxwell/cuda.cuh"
@@ -79,5 +82,7 @@ auto main(int argc, char *argv[]) -> int {
 
     run_stdpar(dt, write_vtk, n_iterations, grid, stdexec::par_unseq, method);
   }
-#endif
+#endif // STDEXEC_HAS_PARALLEL_ALGORITHMS()
 }
+
+#endif // !defined(STDEXEC_CLANGD_INVOKED)
diff --git a/include/exec/sequence/merge_each.hpp b/include/exec/sequence/merge_each.hpp
@@ -32,7 +32,6 @@
 #include "../../stdexec/__detail/__senders_core.hpp"
 #include "../../stdexec/__detail/__stop_token.hpp"
 #include "../../stdexec/__detail/__transform_completion_signatures.hpp"
-#include "../../stdexec/__detail/__unstoppable.hpp"
 #include "../../stdexec/__detail/__variant.hpp"
 
 #include <atomic>
@@ -240,7 +239,7 @@ namespace exec {
 
         __operation_base_interface_t* __op_;
 
-        template <std::same_as<__t> _Self, class... _Env>
+        template <class _Self, class... _Env>
         STDEXEC_EXPLICIT_THIS_BEGIN(
           auto get_completion_signatures)(this _Self&&, _Env&&...) noexcept
           -> stdexec::__mapply<
@@ -252,8 +251,9 @@ namespace exec {
           > {
           return {};
         }
+        STDEXEC_EXPLICIT_THIS_END(get_completion_signatures)
 
-        template <std::same_as<__t> _Self, receiver _ErrorReceiver>
+        template <class _Self, receiver _ErrorReceiver>
         STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _ErrorReceiver&& __rcvr)
           noexcept(__nothrow_move_constructible<_ErrorReceiver>)
             -> __error_op_t<stdexec::__id<_ErrorReceiver>> {
@@ -607,7 +607,7 @@ namespace exec {
         _NestedValueSender __nested_value_;
         __operation_base_interface_t* __op_;
 
-        template <std::same_as<__t> _Self, class... _Env>
+        template <class _Self, class... _Env>
         STDEXEC_EXPLICIT_THIS_BEGIN(
           auto get_completion_signatures)(this _Self&&, _Env&&...) noexcept
           -> stdexec::transform_completion_signatures<
@@ -618,8 +618,9 @@ namespace exec {
           > {
           return {};
         }
+        STDEXEC_EXPLICIT_THIS_END(get_completion_signatures)
 
-        template <std::same_as<__t> _Self, receiver _NestedValueReceiver>
+        template <class _Self, receiver _NestedValueReceiver>
         STDEXEC_EXPLICIT_THIS_BEGIN(
           auto connect)(this _Self&& __self, _NestedValueReceiver&& __rcvr)
           noexcept(__nothrow_constructible_from<
@@ -1072,14 +1073,16 @@ namespace exec {
         _OperationBase* __op_;
         _NestedSequenceSender __nested_sequence_;
 
-        template <std::same_as<__t> _Self, class... _Env>
+        template <class _Self, class... _Env>
         STDEXEC_EXPLICIT_THIS_BEGIN(
           auto get_completion_signatures)(this _Self&&, _Env&&...) noexcept
           -> stdexec::completion_signatures<stdexec::set_value_t(), stdexec::set_stopped_t()> {
           return {};
         }
+        STDEXEC_EXPLICIT_THIS_END(get_completion_signatures)
 
-        template <std::same_as<__t> _Self, receiver _NextReceiver>
+
+        template <class _Self, receiver _NextReceiver>
         STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _NextReceiver&& __rcvr)
           noexcept(__nothrow_constructible_from<
                    __next_sequence_op_t<stdexec::__id<_NextReceiver>>,
diff --git a/include/exec/when_any.hpp b/include/exec/when_any.hpp
@@ -274,10 +274,6 @@ namespace exec {
         template <class _Self, class... _Env>
         STDEXEC_EXPLICIT_THIS_BEGIN(
           auto get_completion_signatures)(this _Self&&, const _Env&...) noexcept {
-          static_assert(__decay_copyable<_Self>);
-          static_assert(
-            (__decay_copyable<__copy_cvref_t<_Self, stdexec::__t<_SenderIds>>> && ...),
-            "All senders passed to when_any must be copyable.");
           return __mexception<
             _SENDER_TYPE_IS_NOT_COPYABLE_,
             _WITH_SENDERS_<stdexec::__t<_SenderIds>>...
diff --git a/include/stdexec/__detail/__completion_signatures.hpp b/include/stdexec/__detail/__completion_signatures.hpp
@@ -124,18 +124,22 @@ namespace stdexec {
         (__declval<__undefined<__partitions<>>&>() * ... * static_cast<_Sigs*>(nullptr))));
 
     template <class _Completions>
-    using __partitions_of_t = typename _Completions::__partitioned::__t;
+    using __partitions_of_t = _Completions::__partitioned::__t;
   } // namespace __sigs
 
   ////////////////////////////////////////////////////////////////////////////////////////////////////
   // completion signatures type traits
+  template <class _Completions>
+  concept __valid_completion_signatures = __ok<_Completions>
+                                       && __sigs::__is_completion_signatures<_Completions>;
+
   template <
     class _Sigs,
     class _Tuple = __qq<__decayed_std_tuple>,
     class _Variant = __qq<__std_variant>
   >
   using __value_types_t =
-    typename __sigs::__partitions_of_t<_Sigs>::template __value_types<_Tuple, _Variant>;
+    __sigs::__partitions_of_t<_Sigs>::template __value_types<_Tuple, _Variant>;
 
   template <
     class _Sndr,
@@ -157,7 +161,7 @@ namespace stdexec {
 
   template <class _Sigs, class _Variant = __qq<__std_variant>, class _Transform = __q1<__midentity>>
   using __error_types_t =
-    typename __sigs::__partitions_of_t<_Sigs>::template __error_types<_Variant, _Transform>;
+    __sigs::__partitions_of_t<_Sigs>::template __error_types<_Variant, _Transform>;
 
   template <
     class _Sender,
@@ -174,13 +178,14 @@ namespace stdexec {
 
   template <class _Sigs, class _Variant, class _Type = set_stopped_t()>
   using __stopped_types_t =
-    typename __sigs::__partitions_of_t<_Sigs>::template __stopped_types<_Variant, _Type>;
+    __sigs::__partitions_of_t<_Sigs>::template __stopped_types<_Variant, _Type>;
 
-  template <class _Sigs>
+  template <__valid_completion_signatures _Sigs>
   inline constexpr bool __sends_stopped =
     __v<typename __sigs::__partitions_of_t<_Sigs>::__count_stopped> != 0;
 
   template <class _Sndr, class... _Env>
+    requires __valid_completion_signatures<__completion_signatures_of_t<_Sndr, _Env...>>
   inline constexpr bool sends_stopped =
     __sends_stopped<__completion_signatures_of_t<_Sndr, _Env...>>;
 
@@ -396,11 +401,6 @@ namespace stdexec {
   using __single_value_variant_sender_t =
     __value_types_t<__completion_signatures_of_t<_Sender, _Env...>, __qq<__types>, __qq<__msingle>>;
 
-
-  template <class _Completions>
-  concept __valid_completion_signatures = __same_as<__ok_t<_Completions>, __msuccess>
-                                       && __sigs::__is_completion_signatures<_Completions>;
-
   template <class _Sender, class... _Env>
   using __unrecognized_sender_error =
     __mexception<_UNRECOGNIZED_SENDER_TYPE_<>, _WITH_SENDER_<_Sender>, _WITH_ENVIRONMENT_<_Env>...>;
diff --git a/include/stdexec/__detail/__diagnostics.hpp b/include/stdexec/__detail/__diagnostics.hpp
@@ -176,29 +176,35 @@ namespace stdexec {
     char const * what_;
   };
 
-  namespace __detail {
-    template <class _Sender>
-    struct __dependent_sender_error : dependent_sender_error {
-      constexpr __dependent_sender_error() noexcept
-        : dependent_sender_error{
-            "This sender needs to know its execution environment before it can know how it will "
-            "complete."} {
-      }
+  template <class _Sender>
+  struct __dependent_sender_error : dependent_sender_error {
+    constexpr __dependent_sender_error() noexcept
+      : dependent_sender_error{
+          "This sender needs to know its execution environment before it can know how it will "
+          "complete."} {
+    }
 
-      STDEXEC_ATTRIBUTE(host, device) auto operator+() -> __dependent_sender_error;
+    STDEXEC_ATTRIBUTE(host, device) auto operator+() -> __dependent_sender_error;
 
-      template <class Ty>
-      STDEXEC_ATTRIBUTE(host, device)
-      auto operator,(Ty&) -> __dependent_sender_error&;
+    template <class Ty>
+    STDEXEC_ATTRIBUTE(host, device)
+    auto operator,(Ty&) -> __dependent_sender_error&;
 
-      template <class... What>
-      STDEXEC_ATTRIBUTE(host, device)
-      auto operator,(stdexec::_ERROR_<What...>&) -> stdexec::_ERROR_<What...>&;
-    };
-  } // namespace __detail
+    template <class... What>
+    STDEXEC_ATTRIBUTE(host, device)
+    auto operator,(_ERROR_<What...>&) -> _ERROR_<What...>&;
 
-  template <class _Sender>
-  using __dependent_sender_error = __detail::__dependent_sender_error<__demangle_t<_Sender>>;
+    using __partitioned = __dependent_sender_error;
+
+    template <class, class>
+    using __value_types = __dependent_sender_error;
+
+    template <class, class>
+    using __error_types = __dependent_sender_error;
+
+    template <class, class>
+    using __stopped_types = __dependent_sender_error;
+  };
 
   template <class _What, class... _With>
   struct __not_a_sender {
diff --git a/include/stdexec/__detail/__let.hpp b/include/stdexec/__detail/__let.hpp
@@ -537,9 +537,8 @@ namespace stdexec {
         []<class _Self, class _Env>(_Self&&, _Env&&...) noexcept {
           static_assert(sender_expr_for<_Self, __let_t<_SetTag>>);
           if constexpr (__decay_copyable<_Self>) {
-            using __result_t =
-              __completions_t<__let_t<_SetTag>, __data_of<_Self>, __child_of<_Self>, _Env>;
-            return __result_t{};
+            using __fn_t = __decay_t<__data_of<_Self>>;
+            return __completions_t<__let_t<_SetTag>, __fn_t, __child_of<_Self>, _Env>{};
           } else {
             return __mexception<_SENDER_TYPE_IS_NOT_COPYABLE_, _WITH_SENDER_<_Self>>{};
           }
diff --git a/include/stdexec/__detail/__meta.hpp b/include/stdexec/__detail/__meta.hpp
diff --git a/include/stdexec/__detail/__transfer_just.hpp b/include/stdexec/__detail/__transfer_just.hpp
diff --git a/include/stdexec/__detail/__transform_sender.hpp b/include/stdexec/__detail/__transform_sender.hpp
diff --git a/include/stdexec/__detail/__type_traits.hpp b/include/stdexec/__detail/__type_traits.hpp
diff --git a/include/stdexec/__detail/__upon_error.hpp b/include/stdexec/__detail/__upon_error.hpp
diff --git a/include/stdexec/__detail/__upon_stopped.hpp b/include/stdexec/__detail/__upon_stopped.hpp

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
	`17`	`+// This file causes clangd to crash during parsing`
	`18`	`+#if !defined(STDEXEC_CLANGD_INVOKED)`
	`19`	`+`
`17`	`20`	`#include "maxwell/snr.cuh"`
`18`	`21`	`#include "maxwell/std.cuh"`
`19`	`22`	`#include "maxwell/stdpar.cuh" // IWYU pragma: keep`
`@@ -85,3 +88,5 @@ auto main(int argc, char *argv[]) -> int {`
`85`	`88`	`}`
`86`	`89`	`#endif`
`87`	`90`	`}`
	`91`	`+`
	`92`	`+#endif // !defined(STDEXEC_CLANGD_INVOKED)`