Skip to content

Revert incorrect <flat_set> change, and update test failure reason #5522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 4 commits into from
May 18, 2025
Merged

Revert incorrect <flat_set> change, and update test failure reason #5522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dd9f89
revert `<flat_set>` product code changes in #5516
AlexGuteniev May 18, 2025
2882d4f
Add skipped tests, but now with LLVM issue
AlexGuteniev May 18, 2025
a7c38a5
also move LLVM-140287: failures
AlexGuteniev May 18, 2025
5603a91
formatting
AlexGuteniev May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 6 additions & 22 deletions stl/inc/flat_set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,12 +486,9 @@ private:
return pair{_Where, false};
}

_Clear_guard _Guard{this};
if constexpr (is_same_v<remove_cvref_t<_Ty>, _Kty>) {
_STL_INTERNAL_CHECK(_Can_insert(_Where, _Val));
iterator _Result = _Mycont.emplace(_Where, _STD forward<_Ty>(_Val));
_Guard._Target = nullptr;
return pair{_STD move(_Result), true};
return pair{_Mycont.emplace(_Where, _STD forward<_Ty>(_Val)), true};
} else {
// heterogeneous insertion
// FIXME: The standard only requires `find(_Val) == find(_Keyval)` (per N4958 [flat.set.modifiers]/2),
Expand All @@ -501,16 +498,11 @@ private:
_STL_ASSERT(_Can_insert(_Where, _Keyval),
"The conversion from the heterogeneous key to key_type should "
"be consistent with the heterogeneous lookup!");
iterator _Result = _Mycont.emplace(_Where, _STD move(_Keyval));
_Guard._Target = nullptr;
return pair{_STD move(_Result), true};
return pair{_Mycont.emplace(_Where, _STD move(_Keyval)), true};
}
} else {
_STL_INTERNAL_STATIC_ASSERT(is_same_v<remove_cvref_t<_Ty>, _Kty>);
_Clear_guard _Guard{this};
iterator _Result = _Mycont.emplace(upper_bound(_Val), _STD forward<_Ty>(_Val));
_Guard._Target = nullptr;
return _Result;
return _Mycont.emplace(upper_bound(_Val), _STD forward<_Ty>(_Val));
}
}

Expand Down Expand Up @@ -538,12 +530,9 @@ private:
return _Where;
}

_Clear_guard _Guard{this};
if constexpr (is_same_v<remove_cvref_t<_Ty>, _Kty>) {
_STL_INTERNAL_CHECK(_Can_insert(_Where, _Val));
iterator _Result = _Mycont.emplace(_Where, _STD forward<_Ty>(_Val));
_Guard._Target = nullptr;
return _Result;
return _Mycont.emplace(_Where, _STD forward<_Ty>(_Val));
} else {
// heterogeneous insertion
// FIXME: The standard only requires `find(_Val) == find(_Keyval)` (per N4958 [flat.set.modifiers]/2),
Expand All @@ -553,9 +542,7 @@ private:
_STL_ASSERT(_Can_insert(_Where, _Keyval),
"The conversion from the heterogeneous key to key_type should "
"be consistent with the heterogeneous lookup!");
iterator _Result = _Mycont.emplace(_Where, _STD move(_Keyval));
_Guard._Target = nullptr;
return _Result;
return _Mycont.emplace(_Where, _STD move(_Keyval));
}
} else {
_STL_INTERNAL_STATIC_ASSERT(is_same_v<remove_cvref_t<_Ty>, _Kty>);
Expand All @@ -575,10 +562,7 @@ private:
}

_STL_INTERNAL_CHECK(_Can_insert(_Where, _Val));
_Clear_guard _Guard{this};
iterator _Result = _Mycont.emplace(_Where, _STD forward<_Ty>(_Val));
_Guard._Target = nullptr;
return _Result;
return _Mycont.emplace(_Where, _STD forward<_Ty>(_Val));
}
}

Expand Down
31 changes: 17 additions & 14 deletions tests/libcxx/expected_results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,23 @@ std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cp
std/strings/basic.string/string.modifiers/string_assign/string.pass.cpp:0 FAIL
std/strings/basic.string/string.modifiers/string_assign/string.pass.cpp:1 FAIL

# LLVM-140287: libc++ test: update MinSequenceContainer.h to make some tests pass on MSVC STL #140287
std/containers/container.adaptors/flat.multiset/flat.multiset.capacity/empty.pass.cpp FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.cons/assign_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.capacity/empty.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.cons/assign_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_range.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_range.pass.cpp FAIL

# LLVM-140448: [libc++][test] flat_set std test uses EmplaceUnsafeContainer which is non-standard
std/containers/container.adaptors/flat.set/flat.set.modifiers/emplace_hint.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/emplace.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_cv.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_iter_cv.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_iter_rv.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_rv.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_transparent.pass.cpp FAIL

# Non-Standard regex behavior.
# "It seems likely that the test is still non-conforming due to how libc++ handles the 'w' character class."
std/re/re.traits/lookup_classname.pass.cpp FAIL
Expand Down Expand Up @@ -609,20 +626,6 @@ std/depr/depr.c.headers/stddef_h.compile.pass.cpp:1 FAIL

# *** LIKELY BOGUS TESTS ***

# P1222R4 <flat_set>;
# error: no member named 'assign' in 'MinSequenceContainer<int>';
# it is mandatory according to [sequence.reqmts]/104
std/containers/container.adaptors/flat.multiset/flat.multiset.capacity/empty.pass.cpp FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.cons/assign_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.capacity/empty.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.cons/assign_initializer_list.pass.cpp FAIL

# P1222R4 <flat_set>;
# error: no member named 'insert_range' in 'MinSequenceContainer<int>';
# it is mandatory according to [sequence.reqmts]/40
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_range.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_range.pass.cpp FAIL

# Test bug after LWG-2899 "is_(nothrow_)move_constructible and tuple, optional and unique_ptr" was accepted.
std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.pass.cpp FAIL
std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp FAIL
Expand Down