llvm
diff --git a/‎libcxx/include/__flat_set/ra_iterator.h
Lines changed: 3 additions & 2 deletions b/‎libcxx/include/__flat_set/ra_iterator.h
Lines changed: 3 additions & 2 deletions
diff --git a/‎libcxx/test/std/containers/container.adaptors/flat.map/flat.map.capacity/empty.verify.cpp renamed to ‎libcxx/test/libcxx/diagnostics/flat_map.nodiscard.verify.cpp b/‎libcxx/test/std/containers/container.adaptors/flat.map/flat.map.capacity/empty.verify.cpp renamed to ‎libcxx/test/libcxx/diagnostics/flat_map.nodiscard.verify.cpp
diff --git a/‎libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.capacity/empty.verify.cpp renamed to ‎libcxx/test/libcxx/diagnostics/flat_multimap.nodiscard.verify.cpp b/‎libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.capacity/empty.verify.cpp renamed to ‎libcxx/test/libcxx/diagnostics/flat_multimap.nodiscard.verify.cpp
diff --git a/‎libcxx/test/std/containers/container.adaptors/flat.set/flat.set.capacity/empty.verify.cpp renamed to ‎libcxx/test/libcxx/diagnostics/flat_set.nodiscard.verify.cpp b/‎libcxx/test/std/containers/container.adaptors/flat.set/flat.set.capacity/empty.verify.cpp renamed to ‎libcxx/test/libcxx/diagnostics/flat_set.nodiscard.verify.cpp
@@ -16,7 +16,6 @@
 #include <__iterator/iterator_traits.h>
 #include <__type_traits/is_constructible.h>
 #include <__utility/move.h>
-#include <iterator>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -42,7 +41,9 @@ struct __ra_iterator {
 
   friend _Container;
 
-  static_assert(std::random_access_iterator<_Iterator>, "Underlying iterator must be a random access iterator");
+  // note: checking the concept random_access_iterator does not work for incomplete types
+  static_assert(__is_same(iterator_traits<_Iterator>::iterator_category, random_access_iterator_tag),
+                "Underlying iterator must be a random access iterator");
 
 public:
   using iterator_concept  = random_access_iterator_tag; // deliberately lower contiguous_iterator