Skip to content

Commit

Permalink
[libc++][memory_resource] Implements LWG3683. (llvm#100775)
Browse files Browse the repository at this point in the history
The polymorphic_allocator was added in C++17.
This issue was filed in 2022 so well after C++20. This issue adds an
operator==.

Starting with C++20 this adds a compiler generated operator!=. To have
the same behaviour in C++17 and C++20 (and later) a manual operator!= is
defined in C++17.

Implements
- LWG3683 operator== for polymorphic_allocator cannot deduce template
argument in common cases
  • Loading branch information
mordante authored and banach-space committed Aug 7, 2024
1 parent ca50690 commit 8bf3171
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 1 deletion.
2 changes: 1 addition & 1 deletion libcxx/docs/Status/Cxx23Issues.csv
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"`3670 <https://wg21.link/LWG3670>`__","``Cpp17InputIterators`` don't have integer-class difference types","July 2022","","","|ranges|"
"`3671 <https://wg21.link/LWG3671>`__","``atomic_fetch_xor`` missing from ``stdatomic.h``","July 2022","",""
"`3672 <https://wg21.link/LWG3672>`__","``common_iterator::operator->()`` should return by value","July 2022","|Complete|","19.0","|ranges|"
"`3683 <https://wg21.link/LWG3683>`__","``operator==`` for ``polymorphic_allocator`` cannot deduce template argument in common cases","July 2022","",""
"`3683 <https://wg21.link/LWG3683>`__","``operator==`` for ``polymorphic_allocator`` cannot deduce template argument in common cases","July 2022","|Complete|","20.0"
"`3687 <https://wg21.link/LWG3687>`__","``expected<cv void, E>`` move constructor should move","July 2022","|Complete|","16.0"
"`3692 <https://wg21.link/LWG3692>`__","``zip_view::iterator``'s ``operator<=>`` is overconstrained","July 2022","","","|ranges| |spaceship|"
"`3701 <https://wg21.link/LWG3701>`__","Make ``formatter<remove_cvref_t<const charT[N]>, charT>`` requirement explicit","July 2022","|Complete|","15.0","|format|"
Expand Down
11 changes: 11 additions & 0 deletions libcxx/include/__memory_resource/polymorphic_allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,17 @@ class _LIBCPP_AVAILABILITY_PMR _LIBCPP_TEMPLATE_VIS polymorphic_allocator {

_LIBCPP_HIDE_FROM_ABI memory_resource* resource() const noexcept { return __res_; }

friend bool operator==(const polymorphic_allocator& __lhs, const polymorphic_allocator& __rhs) noexcept {
return *__lhs.resource() == *__rhs.resource();
}

# if _LIBCPP_STD_VER <= 17
// This overload is not specified, it was added due to LWG3683.
friend bool operator!=(const polymorphic_allocator& __lhs, const polymorphic_allocator& __rhs) noexcept {
return *__lhs.resource() != *__rhs.resource();
}
# endif

private:
template <class... _Args, size_t... _Is>
_LIBCPP_HIDE_FROM_ABI tuple<_Args&&...>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

// UNSUPPORTED: c++03, c++11, c++14
// UNSUPPORTED: availability-pmr-missing

// <memory_resource>

// template <class T> class polymorphic_allocator

// friend bool operator==(const polymorphic_allocator& a,
// const polymorphic_allocator& b) noexcept

#include <memory_resource>
#include <cassert>
#include <vector>

#include "test_macros.h"

int main(int, char**) {
std::pmr::unsynchronized_pool_resource a;
std::pmr::vector<int> vec(&a);

assert(vec.get_allocator() == &a);
static_assert(noexcept(vec.get_allocator() == &a));

// LWG3683 added operator== after C++20. In C++20 operator!= is generated by
// the compiler. Libc++ adds operator!= in C++17 as an extension. MSVC STL
// and libstdc++ have done the same so test this extension unconditionally.
std::pmr::unsynchronized_pool_resource b;

assert(vec.get_allocator() != &b);
static_assert(noexcept(vec.get_allocator() != &b));

return 0;
}

0 comments on commit 8bf3171

Please sign in to comment.