llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libcxx
Author: Nikolas Klauser (philnik777)
<details>
<summary>Changes</summary>
LLVM 20 contained an ABI break that can result in the size of
`std::unordered_{map,set,multimap,multiset}` and `std::deque` changing
when used with an allocator type that is empty and contains a base class
that is the same across rebound allocator instantiations (e.g.
``Allocator<int>`` and ``Allocator<char>`` are both empty and
contain
the same base class).
In addition, the layout of a user-defined type that:
- contains one of the following containers:
`std::unordered_{map,set,multimap,multiset}`, `std::deque`, `std::map`,
`std::set`, `std::multimap`, `std::multiset`, `std::list` or
`std::vector`, and
- passes an empty allocator, comparator or hasher type to that
container, and
- has a member of that same empty allocator, comparator or hasher type
inside the enclosing struct, and
- that member is either marked with `[[no_unique_address]]` or optimized
out via the EBO (empty base optimization) technique
saw its size increase from LLVM 19 to LLVM 20. This was caused by the
usage of `[[no_unique_address]]` within some of libc++'s containers in a
way that allowed subtle interactions with enclosing objects. This is
fixed in LLVM 21 on Clang (returning to the LLVM 19 ABI), however that
implies an ABI break from LLVM 20 to LLVM 21.
Furthermore, fixing this causes a slight regression to constant
evaluation support in `std::unique_ptr`. Specifically, constant
evaluation will now fail when the deleter relies on being
value-initialized for constant-evaluation admissibility. If a
default-initialized deleter can be used during constant evaluation, or
if the default constructor is non-trivial, the `unique_ptr` is not
affected by this regression. In particular, this regression does not
impact any `unique_ptr` using the default deleter.
Note that there is currently no way to realistically fix this ABI break
on GCC, therefore GCC will remain on the ABI introduced in LLVM 19. That
also means that Clang and GCC will have a slightly different ABI for the
small subset of types listed above until we are able to apply the same
fix we did with Clang on GCC.
We fix this regression by surrounding the members of the
`_LIBCPP_COMPRESSED_PAIR` with an anonymous struct. This restricts the
shifting of empty types to the front of the `_LIBCPP_COMPRESSED_PAIR`
instead of throughout the surrounding object. This "frees up" the zero
offset to contain another object of the same type, restoring the ability
to perform EBO or to elide the storage for a type with
`[[no_unique_address]]` in the enclosing (user-defined) struct.
Fixes #<!-- -->154146
Co-authored-by: Louis Dionne <ldionne.2@<!-- -->gmail.com>
---
Patch is 28.43 KiB, truncated to 20.00 KiB below, full version:
https://github.com/llvm/llvm-project/pull/155251.diff
14 Files Affected:
- (modified) libcxx/docs/ReleaseNotes/21.rst (+15)
- (modified) libcxx/include/__memory/compressed_pair.h (+39-15)
- (modified) libcxx/include/string (+12-2)
- (modified) libcxx/test/libcxx/containers/associative/map/abi.compile.pass.cpp
(+10-3)
- (modified) libcxx/test/libcxx/containers/associative/set/abi.compile.pass.cpp
(+10-3)
- (modified)
libcxx/test/libcxx/containers/associative/unord.map/abi.compile.pass.cpp
(+20-4)
- (modified)
libcxx/test/libcxx/containers/associative/unord.set/abi.compile.pass.cpp
(+20-3)
- (modified) libcxx/test/libcxx/containers/sequences/deque/abi.compile.pass.cpp
(+20-2)
- (modified) libcxx/test/libcxx/containers/sequences/list/abi.compile.pass.cpp
(+11-1)
- (modified)
libcxx/test/libcxx/containers/sequences/vector.bool/abi.compile.pass.cpp (+9-2)
- (modified)
libcxx/test/libcxx/containers/sequences/vector/abi.compile.pass.cpp (+11-1)
- (modified)
libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
(+4)
- (modified)
libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
(+4)
- (modified)
libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer.pass.cpp
(+4)
``````````diff
diff --git a/libcxx/docs/ReleaseNotes/21.rst b/libcxx/docs/ReleaseNotes/21.rst
index 74bfa97fd21c2..1410223d56a6f 100644
--- a/libcxx/docs/ReleaseNotes/21.rst
+++ b/libcxx/docs/ReleaseNotes/21.rst
@@ -146,6 +146,21 @@ ABI Affecting Changes
comparison between shared libraries, since all RTTI has the correct
visibility now. There is no behaviour change on
Clang.
+- LLVM 20 contained an ABI break that can result in the size of
``std::unordered_{map,set,multimap,multiset}`` and ``std::deque`` changing when
used with an allocator type that is empty and contains a base class that is the
same across rebound allocator instantiations (e.g. ``Allocator<int>`` and
``Allocator<char>`` are both empty and contain the same base class).
+ In addition, the layout of a user-defined type that:
+
+ - contains one of the following containers:
``std::unordered_{map,set,multimap,multiset}``, ``std::deque``, ``std::map``,
``std::set``, ``std::multimap``, ``std::multiset``, ``std::list`` or
``std::vector``, and
+ - passes an empty allocator, comparator or hasher type to that container,
and
+ - has a member of that same empty allocator, comparator or hasher type
inside the enclosing struct, and
+ - that member is either marked with ``[[no_unique_address]]`` or optimized
out via the EBO (empty base optimization) technique
+
+ saw its size increase from LLVM 19 to LLVM 20. This was caused by the usage
of ``[[no_unique_address]]`` within some of libc++'s containers in a way that
allowed subtle interactions with enclosing objects. This is fixed in LLVM 21
when using the Clang compiler (returning to the LLVM 19 ABI), however that
implies an ABI break from LLVM 20 to LLVM 21.
+
+ Furthermore, fixing this causes a slight regression to constant evaluation
support in ``std::unique_ptr``. Specifically, constant evaluation will now fail
when the deleter relies on being value-initialized for constant-evaluation
admissibility. If a default-initialized deleter can be used during constant
evaluation, or if the default constructor is non-trivial, the ``unique_ptr`` is
not affected by this regression. In particular, this regression does not impact
any ``unique_ptr`` using the default deleter.
+
+ Note that there is currently no way to realistically fix this ABI break on
GCC, therefore GCC will remain on the ABI introduced in LLVM 19. That also
means that Clang and GCC will have a slightly different ABI for the small
subset of types listed above until we are able to apply the same fix we did
with Clang on GCC.
+
+ For more details see https://llvm.org/PR154146.
Build System Changes
--------------------
diff --git a/libcxx/include/__memory/compressed_pair.h
b/libcxx/include/__memory/compressed_pair.h
index fb7b7b7afcc8c..29e503931b0be 100644
--- a/libcxx/include/__memory/compressed_pair.h
+++ b/libcxx/include/__memory/compressed_pair.h
@@ -80,21 +80,45 @@ class __compressed_pair_padding {
template <class _ToPad>
class __compressed_pair_padding<_ToPad, true> {};
-# define _LIBCPP_COMPRESSED_PAIR(T1, Initializer1, T2, Initializer2)
\
- _LIBCPP_NO_UNIQUE_ADDRESS
__attribute__((__aligned__(::std::__compressed_pair_alignment<T2>))) T1
Initializer1; \
- _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1>
_LIBCPP_CONCAT3(__padding1_, __LINE__, _); \
- _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;
\
- _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2>
_LIBCPP_CONCAT3(__padding2_, __LINE__, _)
-
-# define _LIBCPP_COMPRESSED_TRIPLE(T1, Initializer1, T2, Initializer2, T3,
Initializer3) \
- _LIBCPP_NO_UNIQUE_ADDRESS
\
- __attribute__((__aligned__(::std::__compressed_pair_alignment<T2>),
\
- __aligned__(::std::__compressed_pair_alignment<T3>))) T1
Initializer1; \
- _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1>
_LIBCPP_CONCAT3(__padding1_, __LINE__, _); \
- _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;
\
- _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2>
_LIBCPP_CONCAT3(__padding2_, __LINE__, _); \
- _LIBCPP_NO_UNIQUE_ADDRESS T3 Initializer3;
\
- _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T3>
_LIBCPP_CONCAT3(__padding3_, __LINE__, _)
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef _LIBCPP_COMPILER_GCC
+# define _LIBCPP_COMPRESSED_PAIR(T1, Initializer1, T2, Initializer2)
\
+ _LIBCPP_NO_UNIQUE_ADDRESS
__attribute__((__aligned__(::std::__compressed_pair_alignment<T2>))) T1
Initializer1; \
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1>
_LIBCPP_CONCAT3(__padding1_, __LINE__, _); \
+ _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;
\
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2>
_LIBCPP_CONCAT3(__padding2_, __LINE__, _)
+
+# define _LIBCPP_COMPRESSED_TRIPLE(T1, Initializer1, T2, Initializer2, T3,
Initializer3) \
+ _LIBCPP_NO_UNIQUE_ADDRESS
\
+ __attribute__((__aligned__(::std::__compressed_pair_alignment<T2>),
\
+ __aligned__(::std::__compressed_pair_alignment<T3>))) T1
Initializer1; \
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1>
_LIBCPP_CONCAT3(__padding1_, __LINE__, _); \
+ _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;
\
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2>
_LIBCPP_CONCAT3(__padding2_, __LINE__, _); \
+ _LIBCPP_NO_UNIQUE_ADDRESS T3 Initializer3;
\
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T3>
_LIBCPP_CONCAT3(__padding3_, __LINE__, _)
+# else
+# define _LIBCPP_COMPRESSED_PAIR(T1, Initializer1, T2, Initializer2)
\
+ struct {
\
+ _LIBCPP_NO_UNIQUE_ADDRESS
\
+ __attribute__((__aligned__(::std::__compressed_pair_alignment<T2>)))
T1 Initializer1; \
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1>
_LIBCPP_CONCAT3(__padding1_, __LINE__, _); \
+ _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;
\
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2>
_LIBCPP_CONCAT3(__padding2_, __LINE__, _); \
+ }
+
+# define _LIBCPP_COMPRESSED_TRIPLE(T1, Initializer1, T2, Initializer2, T3,
Initializer3) \
+ struct {
\
+ _LIBCPP_NO_UNIQUE_ADDRESS
\
+ __attribute__((__aligned__(::std::__compressed_pair_alignment<T2>),
\
+ __aligned__(::std::__compressed_pair_alignment<T3>)))
T1 Initializer1; \
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1>
_LIBCPP_CONCAT3(__padding1_, __LINE__, _); \
+ _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;
\
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2>
_LIBCPP_CONCAT3(__padding2_, __LINE__, _); \
+ _LIBCPP_NO_UNIQUE_ADDRESS T3 Initializer3;
\
+ _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T3>
_LIBCPP_CONCAT3(__padding3_, __LINE__, _); \
+ }
+# endif
#else
# define _LIBCPP_COMPRESSED_PAIR(T1, Name1, T2, Name2)
\
diff --git a/libcxx/include/string b/libcxx/include/string
index 514dd91c7c172..d282071abf11f 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -974,7 +974,12 @@ public:
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string()
_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
- : __rep_() {
+# if _LIBCPP_STD_VER >= 20 // TODO(LLVM 23): Remove this condition; this is a
workaround for https://llvm.org/PR154567
+ : __rep_(__short())
+# else
+ : __rep_()
+# endif
+ {
__annotate_new(0);
}
@@ -984,7 +989,12 @@ public:
# else
_NOEXCEPT
# endif
- : __rep_(), __alloc_(__a) {
+# if _LIBCPP_STD_VER >= 20 // TODO(LLVM 23): Remove this condition; this is a
workaround for https://llvm.org/PR154567
+ : __rep_(__short()),
+# else
+ : __rep_(),
+# endif
+ __alloc_(__a) {
__annotate_new(0);
}
diff --git a/libcxx/test/libcxx/containers/associative/map/abi.compile.pass.cpp
b/libcxx/test/libcxx/containers/associative/map/abi.compile.pass.cpp
index 04c1802bc84f6..e0598b4ff1746 100644
--- a/libcxx/test/libcxx/containers/associative/map/abi.compile.pass.cpp
+++ b/libcxx/test/libcxx/containers/associative/map/abi.compile.pass.cpp
@@ -8,8 +8,6 @@
// UNSUPPORTED: libcpp-abi-no-compressed-pair-padding
-// XFAIL: FROZEN-CXX03-HEADERS-FIXME
-
#include <cstdint>
#include <map>
@@ -90,7 +88,12 @@ struct user_struct {
};
#if __SIZE_WIDTH__ == 64
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 32, "");
+# else
+static_assert(sizeof(user_struct) == 24, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 8, "");
static_assert(sizeof(map_alloc<int, std::allocator<std::pair<const int, int> >
>) == 24, "");
@@ -119,12 +122,16 @@ static_assert(TEST_ALIGNOF(map_alloc<char,
final_small_iter_allocator<std::pair<
struct TEST_ALIGNAS(32) AlignedLess {};
-// This part of the ABI has been broken between LLVM 19 and LLVM 20.
static_assert(sizeof(std::map<int, int, AlignedLess>) == 64, "");
static_assert(TEST_ALIGNOF(std::map<int, int, AlignedLess>) == 32, "");
#elif __SIZE_WIDTH__ == 32
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 16, "");
+# else
+static_assert(sizeof(user_struct) == 12, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 4, "");
static_assert(sizeof(map_alloc<int, std::allocator<std::pair<const int, int> >
>) == 12, "");
diff --git a/libcxx/test/libcxx/containers/associative/set/abi.compile.pass.cpp
b/libcxx/test/libcxx/containers/associative/set/abi.compile.pass.cpp
index 1b85bb7c93773..14f89b6c9deae 100644
--- a/libcxx/test/libcxx/containers/associative/set/abi.compile.pass.cpp
+++ b/libcxx/test/libcxx/containers/associative/set/abi.compile.pass.cpp
@@ -8,8 +8,6 @@
// UNSUPPORTED: libcpp-abi-no-compressed-pair-padding
-// XFAIL: FROZEN-CXX03-HEADERS-FIXME
-
#include <cstdint>
#include <set>
@@ -90,7 +88,12 @@ struct user_struct {
};
#if __SIZE_WIDTH__ == 64
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 32, "");
+# else
+static_assert(sizeof(user_struct) == 24, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 8, "");
static_assert(sizeof(set_alloc<int, std::allocator<int> >) == 24, "");
@@ -119,12 +122,16 @@ static_assert(TEST_ALIGNOF(set_alloc<char,
final_small_iter_allocator<char> >) =
struct TEST_ALIGNAS(32) AlignedLess {};
-// This part of the ABI has been broken between LLVM 19 and LLVM 20.
static_assert(sizeof(std::set<int, AlignedLess>) == 64, "");
static_assert(TEST_ALIGNOF(std::set<int, AlignedLess>) == 32, "");
#elif __SIZE_WIDTH__ == 32
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 16, "");
+# else
+static_assert(sizeof(user_struct) == 12, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 4, "");
static_assert(sizeof(set_alloc<int, std::allocator<int> >) == 12, "");
diff --git
a/libcxx/test/libcxx/containers/associative/unord.map/abi.compile.pass.cpp
b/libcxx/test/libcxx/containers/associative/unord.map/abi.compile.pass.cpp
index 0476872487036..60c3e5bf31b00 100644
--- a/libcxx/test/libcxx/containers/associative/unord.map/abi.compile.pass.cpp
+++ b/libcxx/test/libcxx/containers/associative/unord.map/abi.compile.pass.cpp
@@ -12,8 +12,6 @@
// unordered containers changes when bounded unique_ptr is enabled.
// UNSUPPORTED: libcpp-has-abi-bounded-unique_ptr
-// XFAIL: FROZEN-CXX03-HEADERS-FIXME
-
#include <cstdint>
#include <unordered_map>
@@ -94,7 +92,12 @@ struct user_struct {
};
#if __SIZE_WIDTH__ == 64
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 48, "");
+# else
+static_assert(sizeof(user_struct) == 40, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 8, "");
static_assert(sizeof(unordered_map_alloc<int, std::allocator<std::pair<const
int, int> > >) == 40, "");
@@ -124,13 +127,21 @@ static_assert(TEST_ALIGNOF(unordered_map_alloc<char,
final_small_iter_allocator<
struct TEST_ALIGNAS(32) AlignedHash {};
struct UnalignedEqualTo {};
-
-// This part of the ABI has been broken between LLVM 19 and LLVM 20.
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(std::unordered_map<int, int, AlignedHash,
UnalignedEqualTo>) == 64, "");
+# else
+static_assert(sizeof(std::unordered_map<int, int, AlignedHash,
UnalignedEqualTo>) == 96, "");
+# endif
static_assert(TEST_ALIGNOF(std::unordered_map<int, int, AlignedHash,
UnalignedEqualTo>) == 32, "");
#elif __SIZE_WIDTH__ == 32
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 24, "");
+# else
+static_assert(sizeof(user_struct) == 20, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 4, "");
static_assert(sizeof(unordered_map_alloc<int, std::allocator<std::pair<const
int, int> > >) == 20, "");
@@ -161,7 +172,12 @@ static_assert(TEST_ALIGNOF(unordered_map_alloc<char,
final_small_iter_allocator<
struct TEST_ALIGNAS(32) AlignedHash {};
struct UnalignedEqualTo {};
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(std::unordered_map<int, int, AlignedHash,
UnalignedEqualTo>) == 64);
+# else
+static_assert(sizeof(std::unordered_map<int, int, AlignedHash,
UnalignedEqualTo>) == 96);
+# endif
static_assert(TEST_ALIGNOF(std::unordered_map<int, int, AlignedHash,
UnalignedEqualTo>) == 32);
#else
diff --git
a/libcxx/test/libcxx/containers/associative/unord.set/abi.compile.pass.cpp
b/libcxx/test/libcxx/containers/associative/unord.set/abi.compile.pass.cpp
index e9d88a126de6c..0216cb1213edf 100644
--- a/libcxx/test/libcxx/containers/associative/unord.set/abi.compile.pass.cpp
+++ b/libcxx/test/libcxx/containers/associative/unord.set/abi.compile.pass.cpp
@@ -12,8 +12,6 @@
// unordered containers changes when bounded unique_ptr is enabled.
// UNSUPPORTED: libcpp-has-abi-bounded-unique_ptr
-// XFAIL: FROZEN-CXX03-HEADERS-FIXME
-
#include <cstdint>
#include <unordered_set>
@@ -94,7 +92,12 @@ struct user_struct {
};
#if __SIZE_WIDTH__ == 64
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 48, "");
+# else
+static_assert(sizeof(user_struct) == 40, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 8, "");
static_assert(sizeof(unordered_set_alloc<int, std::allocator<int> >) == 40,
"");
@@ -124,12 +127,21 @@ static_assert(TEST_ALIGNOF(unordered_set_alloc<char,
final_small_iter_allocator<
struct TEST_ALIGNAS(32) AlignedHash {};
struct UnalignedEqualTo {};
-// This part of the ABI has been broken between LLVM 19 and LLVM 20.
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(std::unordered_set<int, AlignedHash, UnalignedEqualTo>)
== 64, "");
+# else
+static_assert(sizeof(std::unordered_set<int, AlignedHash, UnalignedEqualTo>)
== 96, "");
+# endif
static_assert(TEST_ALIGNOF(std::unordered_set<int, AlignedHash,
UnalignedEqualTo>) == 32, "");
#elif __SIZE_WIDTH__ == 32
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(user_struct) == 24, "");
+# else
+static_assert(sizeof(user_struct) == 20, "");
+# endif
static_assert(TEST_ALIGNOF(user_struct) == 4, "");
static_assert(sizeof(unordered_set_alloc<int, std::allocator<int> >) == 20,
"");
@@ -159,7 +171,12 @@ static_assert(TEST_ALIGNOF(unordered_set_alloc<char,
final_small_iter_allocator<
struct TEST_ALIGNAS(32) AlignedHash {};
struct UnalignedEqualTo {};
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(std::unordered_set<int, AlignedHash, UnalignedEqualTo>)
== 64);
+# else
+static_assert(sizeof(std::unordered_set<int, AlignedHash, UnalignedEqualTo>)
== 96);
+# endif
static_assert(TEST_ALIGNOF(std::unordered_set<int, AlignedHash,
UnalignedEqualTo>) == 32);
#else
diff --git a/libcxx/test/libcxx/containers/sequences/deque/abi.compile.pass.cpp
b/libcxx/test/libcxx/containers/sequences/deque/abi.compile.pass.cpp
index 38f957f416c87..7eaf64ea09d13 100644
--- a/libcxx/test/libcxx/containers/sequences/deque/abi.compile.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/deque/abi.compile.pass.cpp
@@ -8,8 +8,6 @@
// UNSUPPORTED: libcpp-abi-no-compressed-pair-padding
-// XFAIL: FROZEN-CXX03-HEADERS-FIXME
-
#include <cstdint>
#include <deque>
@@ -88,14 +86,24 @@ static_assert(sizeof(std::deque<int, min_allocator<int> >)
== 48, "");
static_assert(sizeof(std::deque<int, test_allocator<int> >) == 80, "");
static_assert(sizeof(std::deque<int, small_iter_allocator<int> >) == 12, "");
static_assert(sizeof(std::deque<int, final_small_iter_allocator<int> >) == 16,
"");
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(std::deque<int, common_base_allocator<int> >) == 56, "");
+# else
+static_assert(sizeof(std::deque<int, common_base_allocator<int> >) == 48, "");
+# endif
static_assert(sizeof(std::deque<char>) == 48, "");
static_assert(sizeof(std::deque<char, min_allocator<char> >) == 48, "");
static_assert(sizeof(std::deque<char, test_allocator<char> >) == 80, "");
static_assert(sizeof(std::deque<char, small_iter_allocator<char> >) == 12, "");
static_assert(sizeof(std::deque<char, final_small_iter_allocator<char> >) ==
16, "");
+// TODO: Fix the ABI for GCC as well once
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121637 is fixed
+# ifdef TEST_COMPILER_GCC
static_assert(sizeof(std::deque<char, common_base_allocator<char> >) == 56,
"");
+# else
+static_assert(sizeof(std::deque<char, common_base_allocator<char> >) == 48,
"");
+# endif
static_assert(TEST_ALIGNOF(std::deque<in...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/155251
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
