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

Jump to bottom

backport to_underlying #2853

Merged
merged 9 commits into from
Nov 19, 2024
Merged

backport to_underlying #2853

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c94939e
backport `to_underlying` to C++11
davebayer Nov 18, 2024
963d881
omit C++11 in pass tests
davebayer Nov 18, 2024
e8d679d
fix test compilation for c++11
davebayer Nov 18, 2024
51cd06a
Update libcudacxx/test/libcudacxx/std/utilities/utility/utility.under…
miscco Nov 18, 2024
19c197b
remove remains of `__to_underlying`
davebayer Nov 18, 2024
95f6048
fix invalid test c++ standard comparison
davebayer Nov 18, 2024
effc1ff
fix constexpr initialization in pass test
davebayer Nov 18, 2024
f1b9640
disable test on bit field enums for pre gcc 9.3 due to unmuteable war…
davebayer Nov 18, 2024
2ade9a8
be more specific with gcc versions when omiting bit field tests
davebayer Nov 19, 2024
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
10 changes: 1 addition & 9 deletions libcudacxx/include/cuda/std/__utility/to_underlying.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,11 @@

_LIBCUDACXX_BEGIN_NAMESPACE_STD

template <class _Tp>
_LIBCUDACXX_HIDE_FROM_ABI constexpr typename underlying_type<_Tp>::type __to_underlying(_Tp __val) noexcept
{
return static_cast<typename underlying_type<_Tp>::type>(__val);
}

#if _CCCL_STD_VER > 2020
template <class _Tp>
_CCCL_NODISCARD _LIBCUDACXX_HIDE_FROM_ABI constexpr underlying_type_t<_Tp> to_underlying(_Tp __val) noexcept
{
return _CUDA_VSTD::__to_underlying(__val);
return static_cast<underlying_type_t<_Tp>>(__val);
}
#endif

_LIBCUDACXX_END_NAMESPACE_STD

Expand Down
5 changes: 3 additions & 2 deletions libcudacxx/include/cuda/std/version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
# include <ciso646> // otherwise go for the smallest possible header
#endif // !_CCCL_COMPILER(NVRTC)

#define __cccl_lib_to_underlying 202102L

#if _CCCL_STD_VER >= 2014
# define __cccl_lib_bit_cast 201806L
# define __cccl_lib_chrono_udls 201304L
Expand Down Expand Up @@ -244,8 +246,7 @@
// # define __cccl_lib_stdatomic_h 202011L
// # define __cccl_lib_string_contains 202011L
// # define __cccl_lib_string_resize_and_overwrite 202110L
# define __cccl_lib_to_underlying 202102L
# define __cccl_lib_unreachable 202202L
# define __cccl_lib_unreachable 202202L

#endif // _CCCL_STD_VER >= 2023

Expand Down
11 changes: 6 additions & 5 deletions libcudacxx/test/libcudacxx/std/utilities/utility/utility.underlying/to_underlying.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
//
//===----------------------------------------------------------------------===//

// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20

// [utility.underlying], to_underlying
// template <class T>
// constexpr underlying_type_t<T> to_underlying( T value ) noexcept; // C++2b
// constexpr underlying_type_t<T> to_underlying( T value ) noexcept;

#include <cuda/std/cassert>
#include <cuda/std/cstdint>
Expand Down Expand Up @@ -61,7 +59,7 @@ struct WithBitfieldEnums
e_bool e3 : 1;
};

__host__ __device__ constexpr bool test()
__host__ __device__ TEST_CONSTEXPR_CXX14 bool test()
{
ASSERT_NOEXCEPT(cuda::std::to_underlying(e_default::a));
ASSERT_SAME_TYPE(int, decltype(cuda::std::to_underlying(e_default::a)));
Expand Down Expand Up @@ -102,7 +100,10 @@ __host__ __device__ constexpr bool test()
int main(int, char**)
{
test();
static_assert(test());

#if TEST_STD_VER >= 14
static_assert(test(), "");
#endif
miscco marked this conversation as resolved.
Show resolved Hide resolved

return 0;
}
4 changes: 1 addition & 3 deletions libcudacxx/test/libcudacxx/std/utilities/utility/utility.underlying/to_underlying.verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
//
//===----------------------------------------------------------------------===//

// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20

// [utility.underlying], to_underlying
// template <class T>
// constexpr underlying_type_t<T> to_underlying( T value ) noexcept; // C++2b
// constexpr underlying_type_t<T> to_underlying( T value ) noexcept;

#include <cuda/std/utility>

Expand Down