[libc++][test] Use LIBCPP_STATIC_ASSERT for std::__mdspan_detail#73436
Merged
StephanTLavavej merged 1 commit intollvm:mainfrom Nov 27, 2023
Merged
Conversation
Member
|
@llvm/pr-subscribers-libcxx Author: Stephan T. Lavavej (StephanTLavavej) ChangesFound while running libc++'s test suite against MSVC's STL.
I checked for other occurrences and these appear to be the only ones which have appeared since our last libc++ test suite update. Full diff: https://github.com/llvm/llvm-project/pull/73436.diff 3 Files Affected:
diff --git a/libcxx/test/std/containers/views/mdspan/layout_left/static_requirements.pass.cpp b/libcxx/test/std/containers/views/mdspan/layout_left/static_requirements.pass.cpp
index b74d129946d40dd..366498803a2ded5 100644
--- a/libcxx/test/std/containers/views/mdspan/layout_left/static_requirements.pass.cpp
+++ b/libcxx/test/std/containers/views/mdspan/layout_left/static_requirements.pass.cpp
@@ -87,7 +87,7 @@
template <class M, size_t... Idxs>
void test_mapping_requirements(std::index_sequence<Idxs...>) {
using E = typename M::extents_type;
- static_assert(std::__mdspan_detail::__is_extents_v<E>);
+ LIBCPP_STATIC_ASSERT(std::__mdspan_detail::__is_extents_v<E>);
static_assert(std::is_copy_constructible_v<M>);
static_assert(std::is_nothrow_move_constructible_v<M>);
static_assert(std::is_nothrow_move_assignable_v<M>);
diff --git a/libcxx/test/std/containers/views/mdspan/layout_right/static_requirements.pass.cpp b/libcxx/test/std/containers/views/mdspan/layout_right/static_requirements.pass.cpp
index 33e736b15029c7d..d460f1a5dbc468a 100644
--- a/libcxx/test/std/containers/views/mdspan/layout_right/static_requirements.pass.cpp
+++ b/libcxx/test/std/containers/views/mdspan/layout_right/static_requirements.pass.cpp
@@ -87,7 +87,7 @@
template <class M, size_t... Idxs>
void test_mapping_requirements(std::index_sequence<Idxs...>) {
using E = typename M::extents_type;
- static_assert(std::__mdspan_detail::__is_extents_v<E>);
+ LIBCPP_STATIC_ASSERT(std::__mdspan_detail::__is_extents_v<E>);
static_assert(std::is_copy_constructible_v<M>);
static_assert(std::is_nothrow_move_constructible_v<M>);
static_assert(std::is_nothrow_move_assignable_v<M>);
diff --git a/libcxx/test/std/containers/views/mdspan/layout_stride/static_requirements.pass.cpp b/libcxx/test/std/containers/views/mdspan/layout_stride/static_requirements.pass.cpp
index 112f4b9e5a04033..b56d0087260d1fc 100644
--- a/libcxx/test/std/containers/views/mdspan/layout_stride/static_requirements.pass.cpp
+++ b/libcxx/test/std/containers/views/mdspan/layout_stride/static_requirements.pass.cpp
@@ -87,7 +87,7 @@
template <class M, size_t... Idxs>
void test_mapping_requirements(std::index_sequence<Idxs...>) {
using E = typename M::extents_type;
- static_assert(std::__mdspan_detail::__is_extents_v<E>);
+ LIBCPP_STATIC_ASSERT(std::__mdspan_detail::__is_extents_v<E>);
static_assert(std::is_copy_constructible_v<M>);
static_assert(std::is_nothrow_move_constructible_v<M>);
static_assert(std::is_nothrow_move_assignable_v<M>);
|
philnik777
approved these changes
Nov 26, 2023
Member
Author
|
Merged as the CI had only unrelated failures in std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp none of which were changed here. Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Found while running libc++'s test suite against MSVC's STL.
libcxx/test/stdshould be portable, so these lines checkingstd::__mdspan_detailmachinery should be usingLIBCPP_STATIC_ASSERT.I checked for other occurrences and these appear to be the only ones which have appeared since our last libc++ test suite update.