Skip to content
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

attempt to work around msvc bug exposed by type_list.h #3487

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+30 −20
Open

attempt to work around msvc bug exposed by type_list.h #3487

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fde381c
attempt to work around msvc bug exposed by type_list.h
ericniebler Jan 22, 2025
f8474b9
fix typo
ericniebler Jan 22, 2025
5aee648
another typo
ericniebler Jan 22, 2025
4341367
properly qualify type
ericniebler Jan 22, 2025
07dbc0a
further simplification of fallback type indexing code
ericniebler Jan 23, 2025
eb2bfb2
Merge branch 'main' into type-list-msvc-war
ericniebler Jan 23, 2025
a11405e
backport to C++11/14
ericniebler Jan 23, 2025
eb82670
Merge branch 'main' into type-list-msvc-war
ericniebler Jan 23, 2025
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
26 changes: 21 additions & 5 deletions libcudacxx/include/cuda/std/__type_traits/type_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,22 +480,27 @@ struct __inherit_flat : _Ts...
template <size_t _Ip, class _Ty>
struct __type_index_leaf
{
using type = _Ty;
using type _CCCL_NODEBUG_ALIAS = _Ty;
};

template <size_t _Ip, class _Ty>
_LIBCUDACXX_HIDE_FROM_ABI __type_index_leaf<_Ip, _Ty> __type_index_get(__type_index_leaf<_Ip, _Ty>*);
_LIBCUDACXX_HIDE_FROM_ABI __type_index_leaf<_Ip, _Ty> __type_index_get(__type_index_leaf<_Ip, _Ty>);

template <class _Is>
struct __type_index_large_size_fn;

template <size_t... _Is>
struct __type_index_large_size_fn<index_sequence<_Is...>>
{
template <class... _Ts>
using __type_tuple _CCCL_NODEBUG_ALIAS = __inherit_flat<__type_index_leaf<_Is, _Ts>...>;

template <size_t _Ip, class... _Ts>
using __type_index_get_result_t _CCCL_NODEBUG_ALIAS =
decltype(__detail::__type_index_get<_Ip>(__type_tuple<_Ts...>{}));

template <class _Ip, class... _Ts>
using __call _CCCL_NODEBUG_ALIAS = //
__type<decltype(__detail::__type_index_get<_Ip::value>(
static_cast<__inherit_flat<__type_index_leaf<_Is, _Ts>...>*>(nullptr)))>;
using __call _CCCL_NODEBUG_ALIAS = __type<__type_index_get_result_t<_Ip, _Ts...>>;
};

template <size_t _Ip>
Expand Down Expand Up @@ -531,9 +536,20 @@ struct __type_index_select_fn<true> // Fast implementation for smaller indices
};
} // namespace __detail

# if !_CCCL_COMPILER(MSVC)

template <class _Ip, class... _Ts>
using __type_index = __type_call<__detail::__type_index_select_fn<(_Ip::value < _CCCL_META_UNROLL_LIMIT)>, _Ip, _Ts...>;

# else // ^^^ !_CCCL_COMPILER(MSVC) ^^^ / vvv _CCCL_COMPILER(MSVC) vvv

// Simplify the implementation for MSVC, which has trouble with the above
template <class _Ip, class... _Ts>
using __type_index =
typename __type_index_large_size_fn<make_index_sequence<sizeof...(_Ts)>>::template __call<_Ip, _Ts...>;

# endif // !_CCCL_COMPILER(MSVC)

template <size_t _Ip, class... _Ts>
using __type_index_c = __type_index<integral_constant<size_t, _Ip>, _Ts...>;

Expand Down
Loading