Fix ASan new-delete-mismatch

Author: winner245

libcxx/test/libcxx/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp

@@ -51,7 +51,7 @@ void test_oversizing_allocator() {
   assert(s.size() == size);
 }
 
-// Ensure that the libc++ implementation of shrink_to_fit does NOT swap buffer with equal allocation sizes
+// Make sure libc++ shrink_to_fit does NOT swap buffer with equal allocation sizes
 void test_no_swap_with_equal_allocation_size() {
   { // Test with custom allocator with a minimum allocation size
     std::basic_string<char, std::char_traits<char>, min_size_allocator<128, char> > s(

libcxx/test/support/increasing_allocator.h

@@ -62,10 +62,10 @@ class min_size_allocator {
   TEST_NODISCARD TEST_CONSTEXPR_CXX20 T* allocate(std::size_t n) {
     if (n < MinAllocSize)
       n = MinAllocSize;
-    return std::allocator<T>().allocate(n);
+    return static_cast<T*>(::operator new(n * sizeof(T)));
   }
 
-  TEST_CONSTEXPR_CXX20 void deallocate(T* p, std::size_t n) TEST_NOEXCEPT { std::allocator<T>().deallocate(p, n); }
+  TEST_CONSTEXPR_CXX20 void deallocate(T* p, std::size_t) TEST_NOEXCEPT { ::operator delete(static_cast<void*>(p)); }
 
   template <typename U>
   struct rebind {
@@ -95,10 +95,10 @@ class pow2_allocator {
   TEST_CONSTEXPR_CXX20 pow2_allocator(const pow2_allocator<U>&) TEST_NOEXCEPT {}
 
   TEST_NODISCARD TEST_CONSTEXPR_CXX20 T* allocate(std::size_t n) {
-    return std::allocator<T>().allocate(next_power_of_two(n));
+    return static_cast<T*>(::operator new(next_power_of_two(n) * sizeof(T)));
   }
 
-  TEST_CONSTEXPR_CXX20 void deallocate(T* p, std::size_t n) TEST_NOEXCEPT { std::allocator<T>().deallocate(p, n); }
+  TEST_CONSTEXPR_CXX20 void deallocate(T* p, std::size_t) TEST_NOEXCEPT { ::operator delete(static_cast<void*>(p)); }
 
 private:
   TEST_CONSTEXPR_CXX20 std::size_t next_power_of_two(std::size_t n) const {