[libc++] Don't instantiate allocators in __tree on an incomplete type #140225
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Nikolas Klauser (philnik777) ChangesThis causes a mismatch between Full diff: https://github.com/llvm/llvm-project/pull/140225.diff 2 Files Affected:
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/support/min_allocator.h b/libcxx/test/support/min_allocator.h
index 24505bbb508d6..4072f9776ccd6 100644
--- a/libcxx/test/support/min_allocator.h
+++ b/libcxx/test/support/min_allocator.h
@@ -390,6 +390,9 @@ class min_allocator
typedef T value_type;
typedef min_pointer<T> pointer;
+ // Make sure that value_type is a complete when min_allocator is instantiated
+ static_assert(alignof(value_type) != 0);
+
min_allocator() = default;
template <class U>
TEST_CONSTEXPR_CXX20 min_allocator(min_allocator<U>) {}
|
philnik777
force-pushed
the
fix_tree_incomplete_type
branch
3 times, most recently
from
b60a8be to
7070a04
Compare
philnik777
force-pushed
the
fix_tree_incomplete_type
branch
from
7070a04 to
c8edd06
Compare
|
The CI failure is unrelated. Landing now, since this fixes a recent regression. |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/169/builds/11526 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This causes a mismatch between
value_typeandallocator_type::value_typein__tree, but I think that's acceptable.__treeprimarily gets a__value_typewrapper due to potential ABI breaks and unwraps it to the same asallocator_type::value_typein the end. A cleanup patch will also change__tree::value_typeto be the same asallocator_type::value_type, making the type mismatch only visible where__treeis instantiated inmap.