From f23f299c046ca017a7cddc6fc290f26f9fe09064 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Tue, 13 Jul 2021 12:38:56 +0000 Subject: [PATCH] [libcxx] [test] Fix experimental/memory.resource.adaptor.mem/db_deallocate on Windows The checks within the libc++experimental memory_resource class uses this limit: _MaxAlign = _LIBCPP_ALIGNOF(max_align_t); Therefore, only use max_align_t for this limit instead of using `__STDCPP_DEFAULT_NEW_ALIGNMENT__` if available. Differential Revision: https://reviews.llvm.org/D105905 --- .../memory.resource.adaptor.mem/db_deallocate.pass.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp b/libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp index 109375b..cbc1e26 100644 --- a/libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp +++ b/libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp @@ -14,8 +14,6 @@ // T* polymorphic_allocator::deallocate(T*, size_t size) -// XFAIL: LIBCXX-WINDOWS-FIXME - int AssertCount = 0; #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (void)::AssertCount++) @@ -38,13 +36,8 @@ int main(int, char**) ex::resource_adaptor r(Alloc{P}); ex::memory_resource & m1 = r; -#ifdef __STDCPP_DEFAULT_NEW_ALIGNMENT__ - std::size_t maxSize = std::numeric_limits::max() - - __STDCPP_DEFAULT_NEW_ALIGNMENT__; -#else std::size_t maxSize = std::numeric_limits::max() - alignof(std::max_align_t); -#endif m1.deallocate(nullptr, maxSize); assert(AssertCount == 0); -- 2.7.4