Skip to content

flat_multiset::emplace_hint() shall place as close as possible to provided hint #5926

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 1 commit into from
Dec 1, 2025
Merged

flat_multiset::emplace_hint() shall place as close as possible to provided hint #5926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions stl/inc/flat_set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,21 +577,22 @@ private:
} else {
_STL_INTERNAL_STATIC_ASSERT(is_same_v<remove_cvref_t<_Ty>, _Kty>);

// look for upper_bound(_Val)
// look for closest position just prior to _Where, respecting ordering
if (_Where == _End || _Compare(_Val, *_Where)) {
// _Val < *_Where
if (_Where == _Begin || !_Compare(_Val, *(_Where - 1))) {
// _Val >= *(_Where-1) ~ upper_bound is _Where
// _Val >= *(_Where-1) ~ closest valid position is _Where
} else {
// _Val < *(_Where-1) ~ upper_bound is in [_Begin,_Where-1]
// _Val < *(_Where-1) ~ closest valid position is upper_bound(_Val) located in [_Begin,_Where-1]
_Where = _STD upper_bound(_Begin, _Where - 1, _Val, _Pass_comp());
}
// _Val < *_Where, so upper_bound is indeed "as close as possible"
_STL_INTERNAL_CHECK(_Can_insert(_Where, _Val));
} else {
// _Val >= *_Where ~ upper_bound is in [_Where+1,_End]
_Where = _STD upper_bound(_Where + 1, _End, _Val, _Pass_comp());
// _Val >= *_Where ~ search for lower_bound in [_Where,_End] to place _Val "as close as possible"
_Where = _STD lower_bound(_Where, _End, _Val, _Pass_comp());
}

_STL_INTERNAL_CHECK(_Can_insert(_Where, _Val));
return _Mycont.emplace(_Where, _STD forward<_Ty>(_Val));
}
}
Expand Down
6 changes: 0 additions & 6 deletions tests/libcxx/expected_results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,6 @@ std/containers/container.adaptors/flat.set/flat.set.cons/move.pass.cpp FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.cons/move_assign.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.cons/move_assign.pass.cpp FAIL

# FIXME! Assertion failed: r == m.begin() + 2
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/emplace_hint.pass.cpp FAIL

# FIXME! Assertion failed: r == m.begin() + 1
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_iter_rv.pass.cpp FAIL

# FIXME! warning C4242: 'initializing': conversion from 'int' to '_Ty', possible loss of data
std/containers/container.adaptors/flat.multiset/flat.multiset.cons/sorted_iter_iter.pass.cpp:0 FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.cons/sorted_iter_iter.pass.cpp:1 FAIL
Expand Down