[libcxx-commits] [libcxx] [libc++][vector] Fixes shrink_to_fit. (PR #97895)
Mital Ashok via libcxx-commits
libcxx-commits at lists.llvm.org
Sat Jul 6 07:16:00 PDT 2024
================
@@ -71,9 +71,50 @@ TEST_CONSTEXPR_CXX20 bool tests() {
return true;
}
+#if TEST_STD_VER >= 23
+std::size_t min_bytes = 1000;
+
+template <typename T>
+struct increasing_allocator {
+ using value_type = T;
+ increasing_allocator() = default;
+ template <typename U>
+ increasing_allocator(const increasing_allocator<U>&) noexcept {}
+ std::allocation_result<T*> allocate_at_least(std::size_t n) {
+ std::size_t allocation_amount = n * sizeof(T);
+ if (allocation_amount < min_bytes)
+ allocation_amount = min_bytes;
+ min_bytes += 1000;
+ return {static_cast<T*>(::operator new(allocation_amount)), allocation_amount};
+ }
+ T* allocate(std::size_t n) { return allocate_at_least(n).ptr; }
+ void deallocate(T* p, std::size_t) noexcept { ::operator delete(static_cast<void*>(p)); }
+};
+
+template <typename T, typename U>
+bool operator==(increasing_allocator<T>, increasing_allocator<U>) {
+ return true;
+}
+
+// https://github.com/llvm/llvm-project/issues/95161
+void test_increasing_allocator() {
+ std::vector<int, increasing_allocator<int>> v;
+ v.push_back(1);
+ assert(is_contiguous_container_asan_correct(v));
+ std::size_t capacity = v.capacity();
+ v.shrink_to_fit();
+ assert(v.capacity() == capacity);
----------------
MitalAshok wrote:
```suggestion
assert(v.capacity() <= capacity);
```
It will be equal in libc++ with this change, but a standard library can report a lower capacity if it wants to.
https://github.com/llvm/llvm-project/pull/97895
More information about the libcxx-commits
mailing list