From 5ff23362011e39feb64a7d4c7433daede1cd9a3f Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 08:54:44 +0700
Subject: [PATCH 01/12] trying to implement P1518R2

---
 stl/inc/deque                                 |  16 ++-
 stl/inc/forward_list                          |  16 ++-
 stl/inc/list                                  |  16 ++-
 stl/inc/queue                                 |   6 +-
 stl/inc/stack                                 |   4 +-
 stl/inc/vector                                |  34 +++++-
 stl/inc/yvals_core.h                          |   1 +
 tests/std/test.lst                            |   1 +
 .../env.lst                                   |   4 +
 .../test.compile.pass.cpp                     | 107 ++++++++++++++++++
 10 files changed, 184 insertions(+), 21 deletions(-)
 create mode 100644 tests/std/tests/P1518R2_stop_overconstraining_allocators/env.lst
 create mode 100644 tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp

diff --git a/stl/inc/deque b/stl/inc/deque
index 9018290d9c6..5cca463f5a8 100644
--- a/stl/inc/deque
+++ b/stl/inc/deque
@@ -11,6 +11,7 @@
 #include <xmemory>
 
 #if _HAS_CXX17
+#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -651,8 +652,12 @@ public:
         _Construct(_Right._Unchecked_begin(), _Right._Unchecked_end());
         _Proxy._Release();
     }
-
-    deque(const deque& _Right, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
+#if _HAS_CXX17
+    deque(const deque& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    deque(const deque& _Right, _Alloc& _Al)
+#endif // _HAS_CXX17
+        : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Alproxy_ty _Alproxy(_Getal());
         _Container_proxy_ptr12<_Alproxy_ty> _Proxy(_Alproxy, _Get_data());
         _Construct(_Right._Unchecked_begin(), _Right._Unchecked_end());
@@ -700,8 +705,13 @@ public:
         _Get_data()._Alloc_proxy(static_cast<_Alproxy_ty>(_Getal()));
         _Take_contents(_Right);
     }
+#if _HAS_CXX17
+    deque(deque&& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    deque(deque&& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
 
-    deque(deque&& _Right, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
+        : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Alproxy_ty _Alproxy(_Getal());
         if constexpr (!_Alty_traits::is_always_equal::value) {
             if (_Getal() != _Right._Getal()) {
diff --git a/stl/inc/forward_list b/stl/inc/forward_list
index 6505741e507..a5808b4ef9c 100644
--- a/stl/inc/forward_list
+++ b/stl/inc/forward_list
@@ -11,6 +11,7 @@
 #include <xmemory>
 
 #if _HAS_CXX17
+#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -586,8 +587,13 @@ public:
         _Alloc_proxy();
         _Insert_op._Attach_after(_Mypair._Myval2._Before_head());
     }
+#if _HAS_CXX17
+    forward_list(const forward_list& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    forward_list(const forward_list& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
 
-    forward_list(const forward_list& _Right, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
+        : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Flist_insert_after_op2<_Alnode> _Insert_op(_Getal());
         _Insert_op._Append_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());
         _Alloc_proxy();
@@ -618,8 +624,12 @@ public:
         _Take_head(_Right);
     }
 
-    forward_list(forward_list&& _Right, const _Alloc& _Al) noexcept(
-        _Alnode_traits::is_always_equal::value) // strengthened
+#if _HAS_CXX17
+    forward_list(forward_list&& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    forward_list(forward_list&& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
+        noexcept(_Alnode_traits::is_always_equal::value) // strengthened
         : _Mypair(_One_then_variadic_args_t{}, _Al) {
         if constexpr (!_Alty_traits::is_always_equal::value) {
             if (_Getal() != _Right._Getal()) {
diff --git a/stl/inc/list b/stl/inc/list
index 58f93ff9bb6..3fafa65d49c 100644
--- a/stl/inc/list
+++ b/stl/inc/list
@@ -11,6 +11,7 @@
 #include <xmemory>
 
 #if _HAS_CXX17
+#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -873,7 +874,13 @@ public:
         _Construct_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());
     }
 
-    list(const list& _Right, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
+
+#if _HAS_CXX17
+    list(const list& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    list(const list& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
+        : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Construct_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());
     }
 
@@ -894,7 +901,12 @@ public:
         _Swap_val(_Right);
     }
 
-    list(list&& _Right, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
+#if _HAS_CXX17
+    list(list&& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    list(list&& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
+        : _Mypair(_One_then_variadic_args_t{}, _Al) {
         if constexpr (!_Alnode_traits::is_always_equal::value) {
             if (_Getal() != _Right._Getal()) {
                 _Construct_range_unchecked(_STD make_move_iterator(_Right._Unchecked_begin()),
diff --git a/stl/inc/queue b/stl/inc/queue
index edf4c79772a..71e9a32785d 100644
--- a/stl/inc/queue
+++ b/stl/inc/queue
@@ -121,9 +121,7 @@ template <class _Container, enable_if_t<!_Is_allocator<_Container>::value, int>
 queue(_Container) -> queue<typename _Container::value_type, _Container>;
 
 template <class _Container, class _Alloc,
-    enable_if_t<
-        conjunction_v<negation<_Is_allocator<_Container>>, _Is_allocator<_Alloc>, uses_allocator<_Container, _Alloc>>,
-        int> = 0>
+    enable_if_t<conjunction_v<negation<_Is_allocator<_Container>>, uses_allocator<_Container, _Alloc>>, int> = 0>
 queue(_Container, _Alloc) -> queue<typename _Container::value_type, _Container>;
 #endif // _HAS_CXX17
 
@@ -307,7 +305,7 @@ priority_queue(_Iter, _Iter, _Pr = _Pr(), _Container = _Container())
     -> priority_queue<_Iter_value_t<_Iter>, _Container, _Pr>;
 
 template <class _Pr, class _Container, class _Alloc,
-    enable_if_t<conjunction_v<negation<_Is_allocator<_Pr>>, negation<_Is_allocator<_Container>>, _Is_allocator<_Alloc>,
+    enable_if_t<conjunction_v<negation<_Is_allocator<_Pr>>, negation<_Is_allocator<_Container>>,
                     uses_allocator<_Container, _Alloc>>,
         int> = 0>
 priority_queue(_Pr, _Container, _Alloc) -> priority_queue<typename _Container::value_type, _Container, _Pr>;
diff --git a/stl/inc/stack b/stl/inc/stack
index 6a9a191ba8a..783da31347f 100644
--- a/stl/inc/stack
+++ b/stl/inc/stack
@@ -111,9 +111,7 @@ template <class _Container, enable_if_t<!_Is_allocator<_Container>::value, int>
 stack(_Container) -> stack<typename _Container::value_type, _Container>;
 
 template <class _Container, class _Alloc,
-    enable_if_t<
-        conjunction_v<negation<_Is_allocator<_Container>>, _Is_allocator<_Alloc>, uses_allocator<_Container, _Alloc>>,
-        int> = 0>
+    enable_if_t<conjunction_v<negation<_Is_allocator<_Container>>, uses_allocator<_Container, _Alloc>>, int> = 0>
 stack(_Container, _Alloc) -> stack<typename _Container::value_type, _Container>;
 #endif // _HAS_CXX17
 
diff --git a/stl/inc/vector b/stl/inc/vector
index 4ec774e6f75..898038bd0f8 100644
--- a/stl/inc/vector
+++ b/stl/inc/vector
@@ -11,6 +11,7 @@
 #include <xmemory>
 
 #if _HAS_CXX17
+#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -527,7 +528,13 @@ public:
         _Construct_n(_Count, _Right_data._Myfirst, _Right_data._Mylast);
     }
 
-    _CONSTEXPR20_CONTAINER vector(const vector& _Right, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
+
+#if _HAS_CXX17
+    _CONSTEXPR20_CONTAINER vector(const vector& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    _CONSTEXPR20_CONTAINER vector(const vector& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
+        : _Mypair(_One_then_variadic_args_t{}, _Al) {
         const auto& _Right_data = _Right._Mypair._Myval2;
         const auto _Count       = static_cast<size_type>(_Right_data._Mylast - _Right_data._Myfirst);
         _Construct_n(_Count, _Right_data._Myfirst, _Right_data._Mylast);
@@ -542,8 +549,13 @@ public:
         _Mypair._Myval2._Swap_proxy_and_iterators(_Right._Mypair._Myval2);
     }
 
-    _CONSTEXPR20_CONTAINER vector(vector&& _Right, const _Alloc& _Al_) noexcept(
-        _Alty_traits::is_always_equal::value) // strengthened
+
+#if _HAS_CXX17
+    _CONSTEXPR20_CONTAINER vector(vector&& _Right, const _Identity_t<_Alloc>& _Al_)
+#else
+    _CONSTEXPR20_CONTAINER vector(vector&& _Right, const _Alloc& _Al_)
+#endif // _HAS_CXX17
+        noexcept(_Alty_traits::is_always_equal::value) // strengthened
         : _Mypair(_One_then_variadic_args_t{}, _Al_) {
         _Alty& _Al        = _Getal();
         auto&& _Alproxy   = _GET_PROXY_ALLOCATOR(_Alty, _Al);
@@ -2487,7 +2499,13 @@ public:
 
     _CONSTEXPR20_CONTAINER vector(const vector& _Right) : _Mybase(_Right) {}
 
-    _CONSTEXPR20_CONTAINER vector(const vector& _Right, const _Alloc& _Al) : _Mybase(_Right, _Al) {}
+#if _HAS_CXX17
+    _CONSTEXPR20_CONTAINER vector(const vector& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    _CONSTEXPR20_CONTAINER vector(const vector& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
+        : _Mybase(_Right, _Al) {
+    }
 
     template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
     _CONSTEXPR20_CONTAINER vector(_Iter _First, _Iter _Last, const _Alloc& _Al = _Alloc()) : _Mybase(_Al) {
@@ -2504,8 +2522,12 @@ public:
         this->_Swap_proxy_and_iterators(_Right);
     }
 
-    _CONSTEXPR20_CONTAINER vector(vector&& _Right, const _Alloc& _Al) noexcept(
-        is_nothrow_constructible_v<_Mybase, _Mybase, const _Alloc&>)
+#if _HAS_CXX17
+    _CONSTEXPR20_CONTAINER vector(vector&& _Right, const _Identity_t<_Alloc>& _Al)
+#else
+    _CONSTEXPR20_CONTAINER vector(vector&& _Right, const _Alloc& _Al)
+#endif // _HAS_CXX17
+        noexcept(is_nothrow_constructible_v<_Mybase, _Mybase, const _Alloc&>)
         : _Mybase(_STD move(_Right), _Al) {
         if constexpr (!_Alvbase_traits::is_always_equal::value) {
             if (this->_Getal() != _Right._Getal()) {
diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h
index 97692b89373..46be93dc609 100644
--- a/stl/inc/yvals_core.h
+++ b/stl/inc/yvals_core.h
@@ -111,6 +111,7 @@
 // P0858R0 Constexpr Iterator Requirements
 // P1065R2 constexpr INVOKE
 //     (the std::invoke function only; other components like bind and reference_wrapper are C++20 only)
+// P1518R2 Stop Overconstraining Allocators In Container Deduction Guides
 // P2162R2 Inheriting From variant
 
 // _HAS_CXX17 indirectly controls:
diff --git a/tests/std/test.lst b/tests/std/test.lst
index 38896e23e0c..7a29300e6aa 100644
--- a/tests/std/test.lst
+++ b/tests/std/test.lst
@@ -417,6 +417,7 @@ tests\P1165R1_consistently_propagating_stateful_allocators
 tests\P1208R6_source_location
 tests\P1423R3_char8_t_remediation
 tests\P1502R1_standard_library_header_units
+tests\P1518R2_stop_overconstraining_allocators
 tests\P1614R2_spaceship
 tests\P1645R1_constexpr_numeric
 tests\P1682R3_to_underlying
diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/env.lst b/tests/std/tests/P1518R2_stop_overconstraining_allocators/env.lst
new file mode 100644
index 00000000000..2de7aab2959
--- /dev/null
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/env.lst
@@ -0,0 +1,4 @@
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+RUNALL_INCLUDE ..\usual_17_matrix.lst
diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
new file mode 100644
index 00000000000..b21f65d85d5
--- /dev/null
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
@@ -0,0 +1,107 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#include <deque>
+#include <forward_list>
+#include <list>
+#include <map>
+#include <memory_resource>
+#include <queue>
+#include <set>
+#include <stack>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+using namespace std;
+
+extern pmr::monotonic_buffer_resource mr;
+
+template <template <class...> class Ctr>
+struct SfinaeTester {
+    template <class... Args>
+    static auto f(int, Args&&... args) -> decltype(Ctr(static_cast<Args&&>(args)...)) {
+        return Ctr(static_cast<Args&&>(args)...);
+    }
+    template <class... Args>
+    static void f(long, Args&&... args) {}
+
+    template <class... Args>
+    static auto test(Args&&... args) {
+        return f(0, static_cast<Args&&>(args)...);
+    }
+};
+
+auto test_deque(pmr::deque<int>& px) {
+    auto x = SfinaeTester<deque>::test(px, &mr);
+}
+
+auto test_forward_list(pmr::forward_list<int>& px) {
+    auto x = SfinaeTester<forward_list>::test(px, &mr);
+}
+
+auto test_list(pmr::list<int>& px) {
+    auto x = SfinaeTester<list>::test(px, &mr);
+}
+
+auto test_vector(pmr::vector<int>& px) {
+    auto x = SfinaeTester<vector>::test(px, &mr);
+}
+
+auto test_map(pmr::map<int, int>& px) {
+    auto x = SfinaeTester<map>::test(px, &mr);
+}
+
+auto test_multimap(pmr::multimap<int, int>& px) {
+    auto x = SfinaeTester<multimap>::test(px, &mr);
+}
+
+auto test_multiset(pmr::multiset<int>& px) {
+    auto x = SfinaeTester<multiset>::test(px, &mr);
+}
+
+auto test_set(pmr::set<int>& px) {
+    auto x = SfinaeTester<set>::test(px, &mr);
+}
+
+auto test_unordered_map(pmr::unordered_map<int, int>& px) {
+    auto x = SfinaeTester<unordered_map>::test(px, &mr);
+}
+
+auto test_unordered_multimap(pmr::unordered_multimap<int, int>& px) {
+    auto x = SfinaeTester<unordered_multimap>::test(px, &mr);
+}
+
+auto test_unordered_multiset(pmr::unordered_multiset<int>& px) {
+    auto x = SfinaeTester<unordered_multiset>::test(px, &mr);
+}
+
+auto test_unordered_set(pmr::unordered_set<int>& px) {
+    auto x = SfinaeTester<unordered_set>::test(px, &mr);
+}
+
+auto test_priority_queue1(priority_queue<int, pmr::vector<int>>& px) {
+    auto x = SfinaeTester<priority_queue>::test(px, &mr);
+}
+
+auto test_queue1(queue<int, pmr::deque<int>>& px) {
+    auto x = SfinaeTester<queue>::test(px, &mr);
+}
+
+auto test_stack1(stack<int, pmr::vector<int>>& px) {
+    auto x = SfinaeTester<stack>::test(px, &mr);
+}
+
+auto test_priority_queue2(less<int> comp, pmr::vector<int>& pc) {
+    auto x = SfinaeTester<priority_queue>::test(comp, pc, &mr);
+}
+
+auto test_queue2(pmr::deque<int>& pc) {
+    auto x = SfinaeTester<queue>::test(pc, &mr);
+}
+
+auto test_stack2(pmr::vector<int>& pc) {
+    auto x = SfinaeTester<stack>::test(pc, &mr);
+}
+
+int main() {} // COMPILE-ONLY

From e7156e32e31989a27cfaa1abc655bcf777c438bc Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 10:16:05 +0700
Subject: [PATCH 02/12] delete empty lines

---
 stl/inc/deque        | 1 -
 stl/inc/forward_list | 1 -
 2 files changed, 2 deletions(-)

diff --git a/stl/inc/deque b/stl/inc/deque
index 5cca463f5a8..9a14755f228 100644
--- a/stl/inc/deque
+++ b/stl/inc/deque
@@ -710,7 +710,6 @@ public:
 #else
     deque(deque&& _Right, const _Alloc& _Al)
 #endif // _HAS_CXX17
-
         : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Alproxy_ty _Alproxy(_Getal());
         if constexpr (!_Alty_traits::is_always_equal::value) {
diff --git a/stl/inc/forward_list b/stl/inc/forward_list
index a5808b4ef9c..4efc4998715 100644
--- a/stl/inc/forward_list
+++ b/stl/inc/forward_list
@@ -592,7 +592,6 @@ public:
 #else
     forward_list(const forward_list& _Right, const _Alloc& _Al)
 #endif // _HAS_CXX17
-
         : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Flist_insert_after_op2<_Alnode> _Insert_op(_Getal());
         _Insert_op._Append_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());

From c4715a237153258349127af9153bfba7f700f1f1 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 10:21:44 +0700
Subject: [PATCH 03/12] delete one more empty line

---
 stl/inc/vector | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stl/inc/vector b/stl/inc/vector
index 898038bd0f8..0a0fcc32d35 100644
--- a/stl/inc/vector
+++ b/stl/inc/vector
@@ -528,7 +528,6 @@ public:
         _Construct_n(_Count, _Right_data._Myfirst, _Right_data._Mylast);
     }
 
-
 #if _HAS_CXX17
     _CONSTEXPR20_CONTAINER vector(const vector& _Right, const _Identity_t<_Alloc>& _Al)
 #else

From 919d44687f2dfb1623f78af7a858bf8334114168 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 10:25:28 +0700
Subject: [PATCH 04/12] miss `const`

---
 stl/inc/deque | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stl/inc/deque b/stl/inc/deque
index 9a14755f228..c0c54ad7b6e 100644
--- a/stl/inc/deque
+++ b/stl/inc/deque
@@ -655,7 +655,7 @@ public:
 #if _HAS_CXX17
     deque(const deque& _Right, const _Identity_t<_Alloc>& _Al)
 #else
-    deque(const deque& _Right, _Alloc& _Al)
+    deque(const deque& _Right, const _Alloc& _Al)
 #endif // _HAS_CXX17
         : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Alproxy_ty _Alproxy(_Getal());

From c40419fa58a4429d523e06be483996fb325039a9 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 10:29:05 +0700
Subject: [PATCH 05/12] fix formatting

---
 stl/inc/deque        | 2 ++
 stl/inc/forward_list | 1 +
 stl/inc/list         | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/stl/inc/deque b/stl/inc/deque
index c0c54ad7b6e..d2b42e09a6c 100644
--- a/stl/inc/deque
+++ b/stl/inc/deque
@@ -652,6 +652,7 @@ public:
         _Construct(_Right._Unchecked_begin(), _Right._Unchecked_end());
         _Proxy._Release();
     }
+
 #if _HAS_CXX17
     deque(const deque& _Right, const _Identity_t<_Alloc>& _Al)
 #else
@@ -705,6 +706,7 @@ public:
         _Get_data()._Alloc_proxy(static_cast<_Alproxy_ty>(_Getal()));
         _Take_contents(_Right);
     }
+
 #if _HAS_CXX17
     deque(deque&& _Right, const _Identity_t<_Alloc>& _Al)
 #else
diff --git a/stl/inc/forward_list b/stl/inc/forward_list
index 4efc4998715..2481ec176a6 100644
--- a/stl/inc/forward_list
+++ b/stl/inc/forward_list
@@ -587,6 +587,7 @@ public:
         _Alloc_proxy();
         _Insert_op._Attach_after(_Mypair._Myval2._Before_head());
     }
+
 #if _HAS_CXX17
     forward_list(const forward_list& _Right, const _Identity_t<_Alloc>& _Al)
 #else
diff --git a/stl/inc/list b/stl/inc/list
index 3fafa65d49c..8bc046bd9c2 100644
--- a/stl/inc/list
+++ b/stl/inc/list
@@ -874,7 +874,6 @@ public:
         _Construct_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());
     }
 
-
 #if _HAS_CXX17
     list(const list& _Right, const _Identity_t<_Alloc>& _Al)
 #else

From 34c5de558107cde8448245d60ea87019fabc62eb Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 10:32:58 +0700
Subject: [PATCH 06/12] delete last empty line

---
 stl/inc/vector | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stl/inc/vector b/stl/inc/vector
index 0a0fcc32d35..a347aaf1f6f 100644
--- a/stl/inc/vector
+++ b/stl/inc/vector
@@ -548,7 +548,6 @@ public:
         _Mypair._Myval2._Swap_proxy_and_iterators(_Right._Mypair._Myval2);
     }
 
-
 #if _HAS_CXX17
     _CONSTEXPR20_CONTAINER vector(vector&& _Right, const _Identity_t<_Alloc>& _Al_)
 #else

From 0c61b02f6e39f2b93c527643a2f16de18936dce2 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 12:39:51 +0700
Subject: [PATCH 07/12] comment out unused parameter

---
 .../test.compile.pass.cpp                                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
index b21f65d85d5..96e1a78c9ae 100644
--- a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
@@ -24,7 +24,7 @@ struct SfinaeTester {
         return Ctr(static_cast<Args&&>(args)...);
     }
     template <class... Args>
-    static void f(long, Args&&... args) {}
+    static void f(long, Args&&... /*args*/) {}
 
     template <class... Args>
     static auto test(Args&&... args) {

From d6cb3fc84ec1b2443a422255390b471dd5670550 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Thu, 1 Jul 2021 13:47:13 +0700
Subject: [PATCH 08/12] omit unused parameter

Co-authored-by: Michael Schellenberger Costa <mschellenbergercosta@gmail.com>
---
 .../test.compile.pass.cpp                                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
index 96e1a78c9ae..4ce504d453b 100644
--- a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
@@ -24,7 +24,7 @@ struct SfinaeTester {
         return Ctr(static_cast<Args&&>(args)...);
     }
     template <class... Args>
-    static void f(long, Args&&... /*args*/) {}
+    static void f(long, Args&&...) {}
 
     template <class... Args>
     static auto test(Args&&... args) {

From 96fd1a39a613e7a1986d71d03db73d9f0a9eba8b Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Fri, 2 Jul 2021 13:14:44 +0700
Subject: [PATCH 09/12] add test for vector bool

---
 .../test.compile.pass.cpp                                     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
index 96e1a78c9ae..f02a4d31271 100644
--- a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
@@ -48,6 +48,10 @@ auto test_vector(pmr::vector<int>& px) {
     auto x = SfinaeTester<vector>::test(px, &mr);
 }
 
+auto test_vector_bool(pmr::vector<bool>& px) {
+    auto x = SfinaeTester<vector>::test(px, &mr);
+}
+
 auto test_map(pmr::map<int, int>& px) {
     auto x = SfinaeTester<map>::test(px, &mr);
 }

From d355e8b6380521a12aaad96210af5ac3c492efa8 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Fri, 2 Jul 2021 20:33:43 +0700
Subject: [PATCH 10/12] add more tests

---
 .../test.compile.pass.cpp                     | 96 +++++++++++--------
 1 file changed, 58 insertions(+), 38 deletions(-)

diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
index 525ac1bb641..b42407255cb 100644
--- a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
@@ -11,6 +11,7 @@
 #include <stack>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 using namespace std;
@@ -32,80 +33,99 @@ struct SfinaeTester {
     }
 };
 
-auto test_deque(pmr::deque<int>& px) {
-    auto x = SfinaeTester<deque>::test(px, &mr);
+void test_deque(pmr::deque<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<deque>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<deque>::test(move(px), &mr);
 }
 
-auto test_forward_list(pmr::forward_list<int>& px) {
-    auto x = SfinaeTester<forward_list>::test(px, &mr);
+void test_forward_list(pmr::forward_list<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<forward_list>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<forward_list>::test(move(px), &mr);
 }
 
-auto test_list(pmr::list<int>& px) {
-    auto x = SfinaeTester<list>::test(px, &mr);
+void test_list(pmr::list<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<list>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<list>::test(move(px), &mr);
 }
 
-auto test_vector(pmr::vector<int>& px) {
-    auto x = SfinaeTester<vector>::test(px, &mr);
+void test_vector(pmr::vector<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<vector>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<vector>::test(move(px), &mr);
 }
 
-auto test_vector_bool(pmr::vector<bool>& px) {
-    auto x = SfinaeTester<vector>::test(px, &mr);
+void test_vector_bool(pmr::vector<bool>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<vector>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<vector>::test(move(px), &mr);
 }
 
-auto test_map(pmr::map<int, int>& px) {
-    auto x = SfinaeTester<map>::test(px, &mr);
+void test_map(pmr::map<int, int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<map>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<map>::test(px, &mr);
 }
 
-auto test_multimap(pmr::multimap<int, int>& px) {
-    auto x = SfinaeTester<multimap>::test(px, &mr);
+void test_multimap(pmr::multimap<int, int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<multimap>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<multimap>::test(move(px), &mr);
 }
 
-auto test_multiset(pmr::multiset<int>& px) {
-    auto x = SfinaeTester<multiset>::test(px, &mr);
+void test_multiset(pmr::multiset<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<multiset>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<multiset>::test(move(px), &mr);
 }
 
-auto test_set(pmr::set<int>& px) {
-    auto x = SfinaeTester<set>::test(px, &mr);
+void test_set(pmr::set<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<set>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<set>::test(move(px), &mr);
 }
 
-auto test_unordered_map(pmr::unordered_map<int, int>& px) {
-    auto x = SfinaeTester<unordered_map>::test(px, &mr);
+void test_unordered_map(pmr::unordered_map<int, int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<unordered_map>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<unordered_map>::test(move(px), &mr);
 }
 
-auto test_unordered_multimap(pmr::unordered_multimap<int, int>& px) {
-    auto x = SfinaeTester<unordered_multimap>::test(px, &mr);
+void test_unordered_multimap(pmr::unordered_multimap<int, int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<unordered_multimap>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<unordered_multimap>::test(move(px), &mr);
 }
 
-auto test_unordered_multiset(pmr::unordered_multiset<int>& px) {
-    auto x = SfinaeTester<unordered_multiset>::test(px, &mr);
+void test_unordered_multiset(pmr::unordered_multiset<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<unordered_multiset>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<unordered_multiset>::test(move(px), &mr);
 }
 
-auto test_unordered_set(pmr::unordered_set<int>& px) {
-    auto x = SfinaeTester<unordered_set>::test(px, &mr);
+void test_unordered_set(pmr::unordered_set<int>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<unordered_set>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<unordered_set>::test(move(px), &mr);
 }
 
-auto test_priority_queue1(priority_queue<int, pmr::vector<int>>& px) {
-    auto x = SfinaeTester<priority_queue>::test(px, &mr);
+void test_priority_queue1(priority_queue<int, pmr::vector<int>>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<priority_queue>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<priority_queue>::test(move(px), &mr);
 }
 
-auto test_queue1(queue<int, pmr::deque<int>>& px) {
-    auto x = SfinaeTester<queue>::test(px, &mr);
+void test_queue1(queue<int, pmr::deque<int>>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<queue>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<queue>::test(move(px), &mr);
 }
 
-auto test_stack1(stack<int, pmr::vector<int>>& px) {
-    auto x = SfinaeTester<stack>::test(px, &mr);
+void test_stack1(stack<int, pmr::vector<int>>& px) {
+    [[maybe_unused]] auto x = SfinaeTester<stack>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<stack>::test(move(px), &mr);
 }
 
-auto test_priority_queue2(less<int> comp, pmr::vector<int>& pc) {
-    auto x = SfinaeTester<priority_queue>::test(comp, pc, &mr);
+void test_priority_queue2(less<int> comp, pmr::vector<int>& pc) {
+    [[maybe_unused]] auto x = SfinaeTester<priority_queue>::test(comp, pc, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<priority_queue>::test(comp, move(pc), &mr);
 }
 
-auto test_queue2(pmr::deque<int>& pc) {
-    auto x = SfinaeTester<queue>::test(pc, &mr);
+void test_queue2(pmr::deque<int>& pc) {
+    [[maybe_unused]] auto x = SfinaeTester<queue>::test(pc, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<queue>::test(move(pc), &mr);
 }
 
-auto test_stack2(pmr::vector<int>& pc) {
-    auto x = SfinaeTester<stack>::test(pc, &mr);
+void test_stack2(pmr::vector<int>& pc) {
+    [[maybe_unused]] auto x = SfinaeTester<stack>::test(pc, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<stack>::test(move(pc), &mr);
 }
 
 int main() {} // COMPILE-ONLY

From 95715bff2d07785146aa4feee317d2b7137fc271 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Fri, 20 Aug 2021 22:38:28 +0700
Subject: [PATCH 11/12] Address review comments

---
 stl/inc/deque                                 | 15 ++--------
 stl/inc/forward_list                          | 13 ++-------
 stl/inc/list                                  | 15 ++--------
 stl/inc/queue                                 |  2 +-
 stl/inc/vector                                | 29 ++++---------------
 .../test.compile.pass.cpp                     |  8 ++++-
 6 files changed, 19 insertions(+), 63 deletions(-)

diff --git a/stl/inc/deque b/stl/inc/deque
index 96243fe7cf4..c605cd56de6 100644
--- a/stl/inc/deque
+++ b/stl/inc/deque
@@ -11,7 +11,6 @@
 #include <xmemory>
 
 #if _HAS_CXX17
-#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -658,12 +657,7 @@ public:
         _Proxy._Release();
     }
 
-#if _HAS_CXX17
-    deque(const deque& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    deque(const deque& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
-        : _Mypair(_One_then_variadic_args_t{}, _Al) {
+    deque(const deque& _Right, const _Identity_t<_Alloc>& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Alproxy_ty _Alproxy(_Getal());
         _Container_proxy_ptr12<_Alproxy_ty> _Proxy(_Alproxy, _Get_data());
         _Construct(_Right._Unchecked_begin(), _Right._Unchecked_end());
@@ -712,12 +706,7 @@ public:
         _Take_contents(_Right);
     }
 
-#if _HAS_CXX17
-    deque(deque&& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    deque(deque&& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
-        : _Mypair(_One_then_variadic_args_t{}, _Al) {
+    deque(deque&& _Right, const _Identity_t<_Alloc>& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Alproxy_ty _Alproxy(_Getal());
         if constexpr (!_Alty_traits::is_always_equal::value) {
             if (_Getal() != _Right._Getal()) {
diff --git a/stl/inc/forward_list b/stl/inc/forward_list
index 27a4706e99b..a26a34c93b8 100644
--- a/stl/inc/forward_list
+++ b/stl/inc/forward_list
@@ -11,7 +11,6 @@
 #include <xmemory>
 
 #if _HAS_CXX17
-#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -581,11 +580,7 @@ public:
         _Insert_op._Attach_after(_Mypair._Myval2._Before_head());
     }
 
-#if _HAS_CXX17
     forward_list(const forward_list& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    forward_list(const forward_list& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
         : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Flist_insert_after_op2<_Alnode> _Insert_op(_Getal());
         _Insert_op._Append_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());
@@ -617,12 +612,8 @@ public:
         _Take_head(_Right);
     }
 
-#if _HAS_CXX17
-    forward_list(forward_list&& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    forward_list(forward_list&& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
-        noexcept(_Alnode_traits::is_always_equal::value) // strengthened
+    forward_list(forward_list&& _Right, const _Identity_t<_Alloc>& _Al) noexcept(
+        _Alnode_traits::is_always_equal::value) // strengthened
         : _Mypair(_One_then_variadic_args_t{}, _Al) {
         if constexpr (!_Alty_traits::is_always_equal::value) {
             if (_Getal() != _Right._Getal()) {
diff --git a/stl/inc/list b/stl/inc/list
index e8f8bf3df11..f4548c4340d 100644
--- a/stl/inc/list
+++ b/stl/inc/list
@@ -11,7 +11,6 @@
 #include <xmemory>
 
 #if _HAS_CXX17
-#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -865,12 +864,7 @@ public:
         _Construct_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());
     }
 
-#if _HAS_CXX17
-    list(const list& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    list(const list& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
-        : _Mypair(_One_then_variadic_args_t{}, _Al) {
+    list(const list& _Right, const _Identity_t<_Alloc>& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
         _Construct_range_unchecked(_Right._Unchecked_begin(), _Right._Unchecked_end());
     }
 
@@ -891,12 +885,7 @@ public:
         _Swap_val(_Right);
     }
 
-#if _HAS_CXX17
-    list(list&& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    list(list&& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
-        : _Mypair(_One_then_variadic_args_t{}, _Al) {
+    list(list&& _Right, const _Identity_t<_Alloc>& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
         if constexpr (!_Alnode_traits::is_always_equal::value) {
             if (_Getal() != _Right._Getal()) {
                 _Construct_range_unchecked(_STD make_move_iterator(_Right._Unchecked_begin()),
diff --git a/stl/inc/queue b/stl/inc/queue
index 660d0815f21..d798d5ed4f6 100644
--- a/stl/inc/queue
+++ b/stl/inc/queue
@@ -366,7 +366,7 @@ template <class _Iter, class _Compare, class _Alloc, class _Container = vector<_
 priority_queue(_Iter, _Iter, _Compare, _Alloc) -> priority_queue<_Iter_value_t<_Iter>, _Container, _Compare>;
 
 template <class _Iter, class _Compare, class _Container, class _Alloc,
-    enable_if_t<conjunction_v<_Is_iterator<_Iter>, _Is_allocator<_Alloc>, uses_allocator<_Container, _Alloc>>, int> = 0>
+    enable_if_t<conjunction_v<_Is_iterator<_Iter>, uses_allocator<_Container, _Alloc>>, int> = 0>
 priority_queue(_Iter, _Iter, _Compare, _Container, _Alloc)
     -> priority_queue<typename _Container::value_type, _Container, _Compare>;
 #endif // _HAS_CXX17
diff --git a/stl/inc/vector b/stl/inc/vector
index b470702f3ec..6c966541cb7 100644
--- a/stl/inc/vector
+++ b/stl/inc/vector
@@ -11,7 +11,6 @@
 #include <xmemory>
 
 #if _HAS_CXX17
-#include <type_traits>
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
@@ -521,11 +520,7 @@ public:
         _Construct_n(_Count, _Right_data._Myfirst, _Right_data._Mylast);
     }
 
-#if _HAS_CXX17
     _CONSTEXPR20 vector(const vector& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    _CONSTEXPR20 vector(const vector& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
         : _Mypair(_One_then_variadic_args_t{}, _Al) {
         const auto& _Right_data = _Right._Mypair._Myval2;
         const auto _Count       = static_cast<size_type>(_Right_data._Mylast - _Right_data._Myfirst);
@@ -541,12 +536,8 @@ public:
         _Mypair._Myval2._Swap_proxy_and_iterators(_Right._Mypair._Myval2);
     }
 
-#if _HAS_CXX17
-    _CONSTEXPR20 vector(vector&& _Right, const _Identity_t<_Alloc>& _Al_)
-#else
-    _CONSTEXPR20 vector(vector&& _Right, const _Alloc& _Al_)
-#endif // _HAS_CXX17
-        noexcept(_Alty_traits::is_always_equal::value) // strengthened
+    _CONSTEXPR20 vector(vector&& _Right, const _Identity_t<_Alloc>& _Al_) noexcept(
+        _Alty_traits::is_always_equal::value) // strengthened
         : _Mypair(_One_then_variadic_args_t{}, _Al_) {
         _Alty& _Al        = _Getal();
         auto&& _Alproxy   = _GET_PROXY_ALLOCATOR(_Alty, _Al);
@@ -2482,13 +2473,7 @@ public:
 
     _CONSTEXPR20 vector(const vector& _Right) : _Mybase(_Right) {}
 
-#if _HAS_CXX17
-    _CONSTEXPR20 vector(const vector& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    _CONSTEXPR20 vector(const vector& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
-        : _Mybase(_Right, _Al) {
-    }
+    _CONSTEXPR20 vector(const vector& _Right, const _Identity_t<_Alloc>& _Al) : _Mybase(_Right, _Al) {}
 
     template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
     _CONSTEXPR20 vector(_Iter _First, _Iter _Last, const _Alloc& _Al = _Alloc()) : _Mybase(_Al) {
@@ -2505,12 +2490,8 @@ public:
         this->_Swap_proxy_and_iterators(_Right);
     }
 
-#if _HAS_CXX17
-    _CONSTEXPR20 vector(vector&& _Right, const _Identity_t<_Alloc>& _Al)
-#else
-    _CONSTEXPR20 vector(vector&& _Right, const _Alloc& _Al)
-#endif // _HAS_CXX17
-        noexcept(is_nothrow_constructible_v<_Mybase, _Mybase, const _Alloc&>)
+    _CONSTEXPR20 vector(vector&& _Right, const _Identity_t<_Alloc>& _Al) noexcept(
+        is_nothrow_constructible_v<_Mybase, _Mybase, const _Alloc&>)
         : _Mybase(_STD move(_Right), _Al) {
         if constexpr (!_Alvbase_traits::is_always_equal::value) {
             if (this->_Getal() != _Right._Getal()) {
diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
index b42407255cb..b010cbc5926 100644
--- a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
@@ -3,6 +3,7 @@
 
 #include <deque>
 #include <forward_list>
+#include <functional>
 #include <list>
 #include <map>
 #include <memory_resource>
@@ -60,7 +61,7 @@ void test_vector_bool(pmr::vector<bool>& px) {
 
 void test_map(pmr::map<int, int>& px) {
     [[maybe_unused]] auto x = SfinaeTester<map>::test(px, &mr);
-    [[maybe_unused]] auto y = SfinaeTester<map>::test(px, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<map>::test(move(px), &mr);
 }
 
 void test_multimap(pmr::multimap<int, int>& px) {
@@ -118,6 +119,11 @@ void test_priority_queue2(less<int> comp, pmr::vector<int>& pc) {
     [[maybe_unused]] auto y = SfinaeTester<priority_queue>::test(comp, move(pc), &mr);
 }
 
+void test_priority_queue3(int* begin, int* end, less<int> comp, pmr::vector<int>& pc) {
+    [[maybe_unused]] auto x = SfinaeTester<priority_queue>::test(begin, end, comp, pc, &mr);
+    [[maybe_unused]] auto y = SfinaeTester<priority_queue>::test(begin, end, comp, move(pc), &mr);
+}
+
 void test_queue2(pmr::deque<int>& pc) {
     [[maybe_unused]] auto x = SfinaeTester<queue>::test(pc, &mr);
     [[maybe_unused]] auto y = SfinaeTester<queue>::test(move(pc), &mr);

From a3ea9bab3368682ddbda60499e9b38301c8fa709 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@microsoft.com>
Date: Wed, 25 Aug 2021 22:24:49 -0700
Subject: [PATCH 12/12] Drop `extern` for the internal test harness.

---
 .../test.compile.pass.cpp                                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
index b010cbc5926..80b8213462b 100644
--- a/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
+++ b/tests/std/tests/P1518R2_stop_overconstraining_allocators/test.compile.pass.cpp
@@ -17,7 +17,7 @@
 
 using namespace std;
 
-extern pmr::monotonic_buffer_resource mr;
+pmr::monotonic_buffer_resource mr;
 
 template <template <class...> class Ctr>
 struct SfinaeTester {