Skip to content

avoid constraint recursion in __basic_any #8121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericniebler merged 3 commits into from
Mar 22, 2026
Merged

avoid constraint recursion in __basic_any #8121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ead6ad
avoid recursive constraint in `basic_any`
ericniebler Mar 20, 2026
90e3973
add a regression test for #8037
ericniebler Mar 20, 2026
2037216
fix cuda-12.0 build
ericniebler Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libcudacxx/include/cuda/__utility/__basic_any/semiregular.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ _CCCL_BEGIN_NAMESPACE_CUDA

_CCCL_EXEC_CHECK_DISABLE
template <class _Tp>
_CCCL_PUBLIC_API auto __move_fn(_Tp& __src, void* __dst) noexcept
-> ::cuda::std::enable_if_t<::cuda::std::movable<_Tp>, void>
_CCCL_PUBLIC_API auto __move_fn(_Tp& __src, void* __dst) noexcept -> void
{
static_assert(::cuda::std::movable<_Tp>, "type must be movable");
::new (__dst) _Tp(static_cast<_Tp&&>(__src));
}

_CCCL_EXEC_CHECK_DISABLE
template <class _Tp>
[[nodiscard]] _CCCL_PUBLIC_API auto __try_move_fn(_Tp& __src, void* __dst, size_t __size, size_t __align)
-> ::cuda::std::enable_if_t<::cuda::std::movable<_Tp>, bool>
[[nodiscard]] _CCCL_PUBLIC_API auto __try_move_fn(_Tp& __src, void* __dst, size_t __size, size_t __align) -> bool
{
static_assert(::cuda::std::movable<_Tp>, "type must be movable");
if (::cuda::__is_small<_Tp>(__size, __align))
{
::new (__dst) _Tp(static_cast<_Tp&&>(__src));
Expand All @@ -81,9 +81,9 @@ template <class _Tp>

_CCCL_EXEC_CHECK_DISABLE
template <class _Tp>
[[nodiscard]] _CCCL_PUBLIC_API auto __copy_fn(_Tp const& __src, void* __dst, size_t __size, size_t __align)
-> ::cuda::std::enable_if_t<::cuda::std::copyable<_Tp>, bool>
[[nodiscard]] _CCCL_PUBLIC_API auto __copy_fn(_Tp const& __src, void* __dst, size_t __size, size_t __align) -> bool
{
static_assert(::cuda::std::copyable<_Tp>, "type must be copyable");
if (::cuda::__is_small<_Tp>(__size, __align))
{
::new (__dst) _Tp(__src);
Expand Down
19 changes: 19 additions & 0 deletions libcudacxx/test/libcudacxx/cuda/memory_resource/any_resource/any_resource.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,23 @@ TEMPLATE_TEST_CASE_METHOD(test_fixture, "Empty property set", "[container][resou
mr.deallocate_sync(this, this->bytes(0), this->align(0));
}
}

struct my_resource_wrapper
{
explicit my_resource_wrapper(cuda::mr::resource_ref<cuda::mr::device_accessible>);

void* allocate(cuda::stream_ref, ::cuda::std::size_t, ::cuda::std::size_t);
void deallocate(cuda::stream_ref, void*, ::cuda::std::size_t, ::cuda::std::size_t) noexcept;
void* allocate_sync(::cuda::std::size_t, ::cuda::std::size_t);
void deallocate_sync(void*, ::cuda::std::size_t, ::cuda::std::size_t) noexcept;
bool operator==(my_resource_wrapper const&) const;
bool operator!=(my_resource_wrapper const&) const;
friend void get_property(my_resource_wrapper const&, cuda::mr::device_accessible) noexcept {}
};

// See https://github.com/NVIDIA/cccl/issues/8037
TEST_CASE("regression test for NVIDIA/cccl#8037", "[container][resource]")
{
STATIC_REQUIRE(cuda::std::move_constructible<my_resource_wrapper>);
}
#endif // __CUDA_ARCH__
Loading