@@ -31,12 +31,7 @@
#include <bits/c++config.h>
-#ifndef _GLIBCXX_ASSERTIONS
-# define __glibcxx_requires_non_empty_range(_First,_Last)
-# define __glibcxx_requires_nonempty()
-# define __glibcxx_requires_subscript(_N)
-#else
-
+#ifndef _GLIBCXX_DEBUG
// Verify that [_First, _Last) forms a non-empty iterator range.
# define __glibcxx_requires_non_empty_range(_First,_Last) \
__glibcxx_assert(_First != _Last)
@@ -45,6 +40,13 @@
// Verify that the container is nonempty
# define __glibcxx_requires_nonempty() \
__glibcxx_assert(!this->empty())
+#else // Use the more verbose Debug Mode checks.
+# define __glibcxx_requires_non_empty_range(_First,_Last) \
+ __glibcxx_check_non_empty_range(_First,_Last)
+# define __glibcxx_requires_nonempty() \
+ __glibcxx_check_nonempty()
+# define __glibcxx_requires_subscript(_N) \
+ __glibcxx_check_subscript(_N)
#endif
#if defined _GLIBCXX_DEBUG && _GLIBCXX_HOSTED
@@ -66,3 +66,47 @@ constexpr bool test_zero()
}
static_assert( test_zero() );
+
+#ifdef __cpp_concepts
+template<typename T = int>
+ constexpr std::false_type
+ access_empty() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<&std::array<T, 0>{}.at(0) != nullptr>::value)
+ constexpr std::true_type
+ access_empty() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<&std::array<T, 0>{}[0] != nullptr>::value)
+ constexpr std::true_type
+ access_empty() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<&std::array<T, 0>{}.front() != nullptr>::value)
+ constexpr std::true_type
+ access_empty() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<&std::array<T, 0>{}.back() != nullptr>::value)
+ constexpr std::true_type
+ access_empty() { return {}; }
+
+static_assert( ! access_empty() );
+
+template<typename T = int>
+ constexpr std::false_type
+ access_past_the_end() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<std::array<T, 1>{}.at(0) != nullptr>::value)
+ constexpr std::true_type
+ access_past_the_end() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<&std::array<T, 1>{}[1] != nullptr>::value)
+ constexpr std::true_type
+ access_past_the_end() { return {}; }
+
+static_assert( ! access_past_the_end() );
+#endif
@@ -85,23 +85,39 @@ template<typename T = int>
access_empty() { return {}; }
template<typename T = int>
- requires (std::bool_constant<(std::vector<T>().at(0), true)>::value)
+ requires (std::bool_constant<&std::vector<T>().at(0) != nullptr>::value)
constexpr std::true_type
access_empty() { return {}; }
template<typename T = int>
- requires (std::bool_constant<(std::vector<T>()[0], true)>::value)
+ requires (std::bool_constant<&std::vector<T>()[0] != nullptr>::value)
constexpr std::true_type
access_empty() { return {}; }
template<typename T = int>
- requires (std::bool_constant<(std::vector<T>().front(), true)>::value)
+ requires (std::bool_constant<&std::vector<T>().front() != nullptr>::value)
constexpr std::true_type
access_empty() { return {}; }
template<typename T = int>
- requires (std::bool_constant<(std::vector<T>().back(), true)>::value)
+ requires (std::bool_constant<&std::vector<T>().back() != nullptr>::value)
constexpr std::true_type
access_empty() { return {}; }
static_assert( ! access_empty() );
+
+template<typename T = int>
+ constexpr std::false_type
+ access_past_the_end() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<&std::vector<T>(3).at(3) != nullptr>::value)
+ constexpr std::true_type
+ access_past_the_end() { return {}; }
+
+template<typename T = int>
+ requires (std::bool_constant<&std::vector<T>(3)[3] != nullptr>::value)
+ constexpr std::true_type
+ access_past_the_end() { return {}; }
+
+static_assert( ! access_past_the_end() );