[llvm-branch-commits] [libcxx] release/19.x: [libc++][vector<bool>] Tests shrink_to_fit requirement. (#98009) (PR #100145)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Jul 23 09:09:12 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libcxx
Author: None (llvmbot)
<details>
<summary>Changes</summary>
Backport c2e4386
Requested by: @<!-- -->ldionne
---
Full diff: https://github.com/llvm/llvm-project/pull/100145.diff
1 Files Affected:
- (modified) libcxx/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp (+44-1)
``````````diff
diff --git a/libcxx/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
index b39245cab7bf4..f8bcee31964bb 100644
--- a/libcxx/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
@@ -39,11 +39,54 @@ TEST_CONSTEXPR_CXX20 bool tests()
return true;
}
+#if TEST_STD_VER >= 23
+template <typename T>
+struct increasing_allocator {
+ using value_type = T;
+ std::size_t min_elements = 1000;
+ increasing_allocator() = default;
+
+ template <typename U>
+ constexpr increasing_allocator(const increasing_allocator<U>& other) noexcept : min_elements(other.min_elements) {}
+
+ constexpr std::allocation_result<T*> allocate_at_least(std::size_t n) {
+ if (n < min_elements)
+ n = min_elements;
+ min_elements += 1000;
+ return std::allocator<T>{}.allocate_at_least(n);
+ }
+ constexpr T* allocate(std::size_t n) { return allocate_at_least(n).ptr; }
+ constexpr void deallocate(T* p, std::size_t n) noexcept { std::allocator<T>{}.deallocate(p, n); }
+};
+
+template <typename T, typename U>
+bool operator==(increasing_allocator<T>, increasing_allocator<U>) {
+ return true;
+}
+
+// https://github.com/llvm/llvm-project/issues/95161
+constexpr bool test_increasing_allocator() {
+ std::vector<bool, increasing_allocator<bool>> v;
+ v.push_back(1);
+ std::size_t capacity = v.capacity();
+ v.shrink_to_fit();
+ assert(v.capacity() <= capacity);
+ assert(v.size() == 1);
+
+ return true;
+}
+#endif // TEST_STD_VER >= 23
+
int main(int, char**)
{
- tests();
+ tests();
#if TEST_STD_VER > 17
static_assert(tests());
#endif
+#if TEST_STD_VER >= 23
+ test_increasing_allocator();
+ static_assert(test_increasing_allocator());
+#endif // TEST_STD_VER >= 23
+
return 0;
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/100145
More information about the llvm-branch-commits
mailing list