[libcxx-commits] [libcxx] [libc++] Don't instantiate allocators in __tree on an incomplete type (PR #140225)
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Sat May 17 13:33:14 PDT 2025
https://github.com/philnik777 updated https://github.com/llvm/llvm-project/pull/140225
>From c8edd065dcce665a98a0b2342b001bf13b22a9f1 Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Fri, 16 May 2025 11:20:01 +0200
Subject: [PATCH] [libc++] Don't instantiate allocators in __tree on an
incomplete type
---
libcxx/include/map | 6 ++----
.../associative/map/incomplete_type.pass.cpp | 4 ++++
libcxx/test/support/min_allocator.h | 21 +++++++++++++++++++
3 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/libcxx/include/map b/libcxx/include/map
index 039ed86dc756f..24eadbd154220 100644
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -911,8 +911,7 @@ public:
private:
typedef std::__value_type<key_type, mapped_type> __value_type;
typedef __map_value_compare<key_type, value_type, key_compare> __vc;
- typedef __rebind_alloc<allocator_traits<allocator_type>, __value_type> __allocator_type;
- typedef __tree<__value_type, __vc, __allocator_type> __base;
+ typedef __tree<__value_type, __vc, allocator_type> __base;
typedef typename __base::__node_traits __node_traits;
typedef allocator_traits<allocator_type> __alloc_traits;
@@ -1596,8 +1595,7 @@ public:
private:
typedef std::__value_type<key_type, mapped_type> __value_type;
typedef __map_value_compare<key_type, value_type, key_compare> __vc;
- typedef __rebind_alloc<allocator_traits<allocator_type>, __value_type> __allocator_type;
- typedef __tree<__value_type, __vc, __allocator_type> __base;
+ typedef __tree<__value_type, __vc, allocator_type> __base;
typedef typename __base::__node_traits __node_traits;
typedef allocator_traits<allocator_type> __alloc_traits;
diff --git a/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp b/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp
index 99fc612698094..6f9e38cf35f5c 100644
--- a/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp
@@ -13,6 +13,7 @@
#include <map>
+#include "min_allocator.h"
#include "test_macros.h"
struct A {
@@ -28,5 +29,8 @@ inline bool operator<(A const& L, A const& R) { return L.data < R.data; }
int main(int, char**) {
A a;
+ // Make sure that the allocator isn't rebound to and incomplete type
+ std::map<int, int, std::less<int>, complete_type_allocator<std::pair<const int, int> > > m;
+
return 0;
}
diff --git a/libcxx/test/support/min_allocator.h b/libcxx/test/support/min_allocator.h
index 24505bbb508d6..3b7d12af24ce0 100644
--- a/libcxx/test/support/min_allocator.h
+++ b/libcxx/test/support/min_allocator.h
@@ -402,6 +402,27 @@ class min_allocator
TEST_CONSTEXPR_CXX20 friend bool operator!=(min_allocator x, min_allocator y) {return !(x == y);}
};
+template <class T>
+class complete_type_allocator {
+public:
+ using value_type = T;
+
+ // Make sure that value_type is a complete when min_allocator is instantiated
+ static_assert(TEST_ALIGNOF(value_type) != 0, "");
+
+ TEST_CONSTEXPR_CXX20 complete_type_allocator() TEST_NOEXCEPT {}
+
+ template <class U>
+ TEST_CONSTEXPR_CXX20 explicit complete_type_allocator(complete_type_allocator<U>) TEST_NOEXCEPT {}
+
+ TEST_CONSTEXPR_CXX20 T* allocate(std::size_t n) { return static_cast<T*>(std::allocator<T>().allocate(n)); }
+
+ TEST_CONSTEXPR_CXX20 void deallocate(T* p, std::size_t n) { std::allocator<T>().deallocate(p, n); }
+
+ TEST_CONSTEXPR_CXX20 friend bool operator==(complete_type_allocator, complete_type_allocator) { return true; }
+ TEST_CONSTEXPR_CXX20 friend bool operator!=(complete_type_allocator, complete_type_allocator) { return false; }
+};
+
template <class T>
class explicit_allocator
{
More information about the libcxx-commits
mailing list