give messages to static_asserts

NVIDIA · Dec 20, 2024 · 57ff710 · 57ff710
1 parent 5ddac4f
commit 57ff710
Show file tree

Hide file tree

Showing 77 changed files with 1,395 additions and 1,362 deletions.
diff --git a/...xx/test/libcudacxx/std/containers/views/views.span/enable_borrowed_range.compile.pass.cpp b/...xx/test/libcudacxx/std/containers/views/views.span/enable_borrowed_range.compile.pass.cpp
@@ -22,11 +22,11 @@
 
 int main(int, char**)
 {
-  static_assert(cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 0>>);
-  static_assert(cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 42>>);
-  static_assert(cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, cuda::std::dynamic_extent>>);
-  static_assert(!cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 42>&>);
-  static_assert(!cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 42> const>);
+  static_assert(cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 0>>, "");
+  static_assert(cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 42>>, "");
+  static_assert(cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, cuda::std::dynamic_extent>>, "");
+  static_assert(!cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 42>&>, "");
+  static_assert(!cuda::std::ranges::enable_borrowed_range<cuda::std::span<int, 42> const>, "");
 
   return 0;
 }
diff --git a/...est/libcudacxx/std/containers/views/views.span/range_concept_conformance.compile.pass.cpp b/...est/libcudacxx/std/containers/views/views.span/range_concept_conformance.compile.pass.cpp
@@ -18,23 +18,23 @@
 
 using range = cuda::std::span<int>;
 
-static_assert(cuda::std::same_as<cuda::std::ranges::iterator_t<range>, range::iterator>);
-static_assert(cuda::std::ranges::common_range<range>);
-static_assert(cuda::std::ranges::random_access_range<range>);
-static_assert(cuda::std::ranges::contiguous_range<range>);
-static_assert(cuda::std::ranges::view<range> && cuda::std::ranges::enable_view<range>);
-static_assert(cuda::std::ranges::sized_range<range>);
-static_assert(cuda::std::ranges::borrowed_range<range>);
-static_assert(cuda::std::ranges::viewable_range<range>);
+static_assert(cuda::std::same_as<cuda::std::ranges::iterator_t<range>, range::iterator>, "");
+static_assert(cuda::std::ranges::common_range<range>, "");
+static_assert(cuda::std::ranges::random_access_range<range>, "");
+static_assert(cuda::std::ranges::contiguous_range<range>, "");
+static_assert(cuda::std::ranges::view<range> && cuda::std::ranges::enable_view<range>, "");
+static_assert(cuda::std::ranges::sized_range<range>, "");
+static_assert(cuda::std::ranges::borrowed_range<range>, "");
+static_assert(cuda::std::ranges::viewable_range<range>, "");
 
-static_assert(cuda::std::same_as<cuda::std::ranges::iterator_t<range const>, range::iterator>);
-static_assert(cuda::std::ranges::common_range<range const>);
-static_assert(cuda::std::ranges::random_access_range<range const>);
-static_assert(cuda::std::ranges::contiguous_range<range const>);
-static_assert(!cuda::std::ranges::view<range const> && !cuda::std::ranges::enable_view<range const>);
-static_assert(cuda::std::ranges::sized_range<range const>);
-static_assert(cuda::std::ranges::borrowed_range<range const>);
-static_assert(cuda::std::ranges::viewable_range<range const>);
+static_assert(cuda::std::same_as<cuda::std::ranges::iterator_t<range const>, range::iterator>, "");
+static_assert(cuda::std::ranges::common_range<range const>, "");
+static_assert(cuda::std::ranges::random_access_range<range const>, "");
+static_assert(cuda::std::ranges::contiguous_range<range const>, "");
+static_assert(!cuda::std::ranges::view<range const> && !cuda::std::ranges::enable_view<range const>, "");
+static_assert(cuda::std::ranges::sized_range<range const>, "");
+static_assert(cuda::std::ranges::borrowed_range<range const>, "");
+static_assert(cuda::std::ranges::viewable_range<range const>, "");
 
 int main(int, char**)
 {

diff --git a/...dacxx/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp b/...dacxx/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp
@@ -17,10 +17,10 @@
 
 #include "test_iterators.h"
 
-static_assert(cuda::std::same_as<cuda::std::iter_reference_t<cpp17_input_iterator<int*>>, int&>);
-static_assert(cuda::std::same_as<cuda::std::iter_reference_t<forward_iterator<int*>>, int&>);
-static_assert(cuda::std::same_as<cuda::std::iter_reference_t<bidirectional_iterator<int*>>, int&>);
-static_assert(cuda::std::same_as<cuda::std::iter_reference_t<random_access_iterator<int*>>, int&>);
+static_assert(cuda::std::same_as<cuda::std::iter_reference_t<cpp17_input_iterator<int*>>, int&>, "");
+static_assert(cuda::std::same_as<cuda::std::iter_reference_t<forward_iterator<int*>>, int&>, "");
+static_assert(cuda::std::same_as<cuda::std::iter_reference_t<bidirectional_iterator<int*>>, int&>, "");
+static_assert(cuda::std::same_as<cuda::std::iter_reference_t<random_access_iterator<int*>>, int&>, "");
 
 int main(int, char**)
 {

diff --git a/...acxx/std/iterators/iterator.primitives/std.iterator.tags/contiguous_iterator_tag.pass.cpp b/...acxx/std/iterators/iterator.primitives/std.iterator.tags/contiguous_iterator_tag.pass.cpp
@@ -23,8 +23,9 @@ int main(int, char**)
   cuda::std::contiguous_iterator_tag tag;
   ((void) tag); // Prevent unused warning
   static_assert(
-    (cuda::std::is_base_of<cuda::std::random_access_iterator_tag, cuda::std::contiguous_iterator_tag>::value));
-  static_assert((!cuda::std::is_base_of<cuda::std::output_iterator_tag, cuda::std::contiguous_iterator_tag>::value));
+    (cuda::std::is_base_of<cuda::std::random_access_iterator_tag, cuda::std::contiguous_iterator_tag>::value), "");
+  static_assert((!cuda::std::is_base_of<cuda::std::output_iterator_tag, cuda::std::contiguous_iterator_tag>::value),
+                "");
 
   return 0;
 }
diff --git a/...std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable.compile.pass.cpp b/...std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable.compile.pass.cpp
@@ -29,43 +29,43 @@ struct CopyOnly
 };
 
 // Can copy the underlying objects between pointers.
-static_assert(cuda::std::indirectly_copyable<int*, int*>);
-static_assert(cuda::std::indirectly_copyable<const int*, int*>);
+static_assert(cuda::std::indirectly_copyable<int*, int*>, "");
+static_assert(cuda::std::indirectly_copyable<const int*, int*>, "");
 
 // Can't copy if the output pointer is const.
-static_assert(!cuda::std::indirectly_copyable<int*, const int*>);
-static_assert(!cuda::std::indirectly_copyable<const int*, const int*>);
+static_assert(!cuda::std::indirectly_copyable<int*, const int*>, "");
+static_assert(!cuda::std::indirectly_copyable<const int*, const int*>, "");
 
 // Can copy from a pointer into an array but arrays aren't considered indirectly copyable-from.
-static_assert(cuda::std::indirectly_copyable<int*, int[2]>);
-static_assert(!cuda::std::indirectly_copyable<int[2], int*>);
-static_assert(!cuda::std::indirectly_copyable<int[2], int[2]>);
-static_assert(!cuda::std::indirectly_copyable<int (&)[2], int (&)[2]>);
+static_assert(cuda::std::indirectly_copyable<int*, int[2]>, "");
+static_assert(!cuda::std::indirectly_copyable<int[2], int*>, "");
+static_assert(!cuda::std::indirectly_copyable<int[2], int[2]>, "");
+static_assert(!cuda::std::indirectly_copyable<int (&)[2], int (&)[2]>, "");
 
 // Can't copy between non-pointer types.
-static_assert(!cuda::std::indirectly_copyable<int*, int>);
-static_assert(!cuda::std::indirectly_copyable<int, int*>);
-static_assert(!cuda::std::indirectly_copyable<int, int>);
+static_assert(!cuda::std::indirectly_copyable<int*, int>, "");
+static_assert(!cuda::std::indirectly_copyable<int, int*>, "");
+static_assert(!cuda::std::indirectly_copyable<int, int>, "");
 
 // Check some less common types.
-static_assert(!cuda::std::indirectly_movable<void*, void*>);
-static_assert(!cuda::std::indirectly_movable<int*, void*>);
-static_assert(!cuda::std::indirectly_movable<int(), int()>);
-static_assert(!cuda::std::indirectly_movable<int*, int()>);
-static_assert(!cuda::std::indirectly_movable<void, void>);
+static_assert(!cuda::std::indirectly_movable<void*, void*>, "");
+static_assert(!cuda::std::indirectly_movable<int*, void*>, "");
+static_assert(!cuda::std::indirectly_movable<int(), int()>, "");
+static_assert(!cuda::std::indirectly_movable<int*, int()>, "");
+static_assert(!cuda::std::indirectly_movable<void, void>, "");
 
 // Can't copy move-only objects.
-static_assert(!cuda::std::indirectly_copyable<MoveOnly*, MoveOnly*>);
-static_assert(!cuda::std::indirectly_copyable<MoveOnly*, const MoveOnly*>);
-static_assert(!cuda::std::indirectly_copyable<const MoveOnly*, MoveOnly*>);
-static_assert(!cuda::std::indirectly_copyable<const MoveOnly*, const MoveOnly*>);
+static_assert(!cuda::std::indirectly_copyable<MoveOnly*, MoveOnly*>, "");
+static_assert(!cuda::std::indirectly_copyable<MoveOnly*, const MoveOnly*>, "");
+static_assert(!cuda::std::indirectly_copyable<const MoveOnly*, MoveOnly*>, "");
+static_assert(!cuda::std::indirectly_copyable<const MoveOnly*, const MoveOnly*>, "");
 
 // Can copy copy-only objects.
 #ifndef TEST_COMPILER_MSVC_2017 // MSVC2017 has issues determining common_reference
-static_assert(cuda::std::indirectly_copyable<CopyOnly*, CopyOnly*>);
-static_assert(!cuda::std::indirectly_copyable<CopyOnly*, const CopyOnly*>);
-static_assert(cuda::std::indirectly_copyable<const CopyOnly*, CopyOnly*>);
-static_assert(!cuda::std::indirectly_copyable<const CopyOnly*, const CopyOnly*>);
+static_assert(cuda::std::indirectly_copyable<CopyOnly*, CopyOnly*>, "");
+static_assert(!cuda::std::indirectly_copyable<CopyOnly*, const CopyOnly*>, "");
+static_assert(cuda::std::indirectly_copyable<const CopyOnly*, CopyOnly*>, "");
+static_assert(!cuda::std::indirectly_copyable<const CopyOnly*, const CopyOnly*>, "");
 #endif // TEST_COMPILER_MSVC_2017
 
 template <class T>
@@ -77,13 +77,13 @@ struct PointerTo
 
 #ifndef TEST_COMPILER_MSVC_2017 // MSVC2017 has issues determining common_reference
 // Can copy through a dereferenceable class.
-static_assert(cuda::std::indirectly_copyable<int*, PointerTo<int>>);
-static_assert(!cuda::std::indirectly_copyable<int*, PointerTo<const int>>);
-static_assert(cuda::std::indirectly_copyable<PointerTo<int>, PointerTo<int>>);
-static_assert(!cuda::std::indirectly_copyable<PointerTo<int>, PointerTo<const int>>);
-static_assert(cuda::std::indirectly_copyable<CopyOnly*, PointerTo<CopyOnly>>);
-static_assert(cuda::std::indirectly_copyable<PointerTo<CopyOnly>, CopyOnly*>);
-static_assert(cuda::std::indirectly_copyable<PointerTo<CopyOnly>, PointerTo<CopyOnly>>);
+static_assert(cuda::std::indirectly_copyable<int*, PointerTo<int>>, "");
+static_assert(!cuda::std::indirectly_copyable<int*, PointerTo<const int>>, "");
+static_assert(cuda::std::indirectly_copyable<PointerTo<int>, PointerTo<int>>, "");
+static_assert(!cuda::std::indirectly_copyable<PointerTo<int>, PointerTo<const int>>, "");
+static_assert(cuda::std::indirectly_copyable<CopyOnly*, PointerTo<CopyOnly>>, "");
+static_assert(cuda::std::indirectly_copyable<PointerTo<CopyOnly>, CopyOnly*>, "");
+static_assert(cuda::std::indirectly_copyable<PointerTo<CopyOnly>, PointerTo<CopyOnly>>, "");
 #endif // TEST_COMPILER_MSVC_2017
 
 int main(int, char**)

diff --git a/...s/iterator.requirements/alg.req.ind.copy/indirectly_copyable.subsumption.compile.pass.cpp b/...s/iterator.requirements/alg.req.ind.copy/indirectly_copyable.subsumption.compile.pass.cpp
@@ -29,7 +29,7 @@ __host__ __device__ constexpr bool indirectly_copyable_subsumption()
   return true;
 }
 
-static_assert(indirectly_copyable_subsumption<int*, int*>());
+static_assert(indirectly_copyable_subsumption<int*, int*>(), "");
 
 int main(int, char**)
 {