Skip to content

Commit fe64896

Browse files
committed
[libc++][C++03] Fix abi.compile.pass.cpp tests
1 parent 0f35df3 commit fe64896

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

libcxx/test/libcxx-03/containers/associative/unord.map/abi.compile.pass.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// unordered containers changes when bounded unique_ptr is enabled.
1313
// UNSUPPORTED: libcpp-has-abi-bounded-unique_ptr
1414

15-
// XFAIL: FROZEN-CXX03-HEADERS-FIXME
16-
1715
#include <cstdint>
1816
#include <unordered_map>
1917

@@ -99,8 +97,7 @@ static_assert(TEST_ALIGNOF(unordered_map_alloc<char, final_small_iter_allocator<
9997
struct TEST_ALIGNAS(32) AlignedHash {};
10098
struct UnalignedEqualTo {};
10199

102-
// This part of the ABI has been broken between LLVM 19 and LLVM 20.
103-
static_assert(sizeof(std::unordered_map<int, int, AlignedHash, UnalignedEqualTo>) == 64, "");
100+
static_assert(sizeof(std::unordered_map<int, int, AlignedHash, UnalignedEqualTo>) == 96, "");
104101
static_assert(TEST_ALIGNOF(std::unordered_map<int, int, AlignedHash, UnalignedEqualTo>) == 32, "");
105102

106103
#elif __SIZE_WIDTH__ == 32

libcxx/test/libcxx-03/containers/associative/unord.set/abi.compile.pass.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// unordered containers changes when bounded unique_ptr is enabled.
1313
// UNSUPPORTED: libcpp-has-abi-bounded-unique_ptr
1414

15-
// XFAIL: FROZEN-CXX03-HEADERS-FIXME
16-
1715
#include <cstdint>
1816
#include <unordered_set>
1917

@@ -98,8 +96,7 @@ static_assert(TEST_ALIGNOF(unordered_set_alloc<char, final_small_iter_allocator<
9896
struct TEST_ALIGNAS(32) AlignedHash {};
9997
struct UnalignedEqualTo {};
10098

101-
// This part of the ABI has been broken between LLVM 19 and LLVM 20.
102-
static_assert(sizeof(std::unordered_set<int, AlignedHash, UnalignedEqualTo>) == 64, "");
99+
static_assert(sizeof(std::unordered_set<int, AlignedHash, UnalignedEqualTo>) == 96, "");
103100
static_assert(TEST_ALIGNOF(std::unordered_set<int, AlignedHash, UnalignedEqualTo>) == 32, "");
104101

105102
#elif __SIZE_WIDTH__ == 32

0 commit comments

Comments
 (0)