https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77691

--- Comment #38 from Jonathan Wakely <redi at gcc dot gnu.org> ---
Author: redi
Date: Wed May 22 20:29:39 2019
New Revision: 271522

URL: https://gcc.gnu.org/viewcvs?rev=271522&root=gcc&view=rev
Log:
PR libstdc++/77691 fix resource_adaptor failures due to max_align_t bugs

Remove the hardcoded whitelist of allocators expected to return memory
aligned to alignof(max_align_t), because that doesn't work when the
platform's malloc() and GCC's max_align_t do not agree what the largest
fundamental alignment is. It's also sub-optimal for user-defined
allocators that return memory suitable for any fundamental alignment.

Instead use a hardcoded list of alignments that are definitely supported
by the platform malloc, and use a copy of the allocator rebound to a POD
type with the requested alignment. Only allocate an oversized
buffer to use with std::align for alignments larger than any of the
hardcoded values.

For 32-bit Solaris x86 do not include alignof(max_align_t) in the
hardcoded values.

        PR libstdc++/77691
        * include/experimental/memory_resource: Add system header pragma.
        (__resource_adaptor_common::__guaranteed_alignment): Remove.
        (__resource_adaptor_common::_Types)
        (__resource_adaptor_common::__new_list)
        (__resource_adaptor_common::_New_list)
        (__resource_adaptor_common::_Alignments)
        (__resource_adaptor_common::_Fund_align_types): New utilities for
        creating a list of types with fundamental alignments.
        (__resource_adaptor_imp::do_allocate): Call new _M_allocate function.
        (__resource_adaptor_imp::do_deallocate): Call new _M_deallocate
        function.
        (__resource_adaptor_imp::_M_allocate): New function that first tries
        to use an allocator rebound to a type with a fundamental alignment.
        (__resource_adaptor_imp::_M_deallocate): Likewise for deallocation.
        * testsuite/experimental/memory_resource/new_delete_resource.cc:
        Adjust expected allocation sizes.
        * testsuite/experimental/memory_resource/resource_adaptor.cc: Remove
        xfail.

Modified:
    trunk/libstdc++-v3/ChangeLog
    trunk/libstdc++-v3/include/experimental/memory_resource
   
trunk/libstdc++-v3/testsuite/experimental/memory_resource/new_delete_resource.cc
   
trunk/libstdc++-v3/testsuite/experimental/memory_resource/resource_adaptor.cc

Reply via email to