Skip to content

<flat_set>: insert range invariant fix #5514

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 2 commits into from
May 17, 2025
Merged

<flat_set>: insert range invariant fix #5514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dbcb3d
insert range invariant
AlexGuteniev May 16, 2025
4a03da7
more tests pass
AlexGuteniev May 16, 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
2 changes: 2 additions & 0 deletions stl/inc/flat_set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,10 @@ private:
template <bool _NeedSorting, class _Iter>
void _Insert_range(const _Iter _First, const _Iter _Last) {
const size_type _Old_size = size();
_Clear_guard _Guard{this};
_Mycont.insert(_Mycont.end(), _First, _Last);
_Restore_invariants_after_insert<_NeedSorting>(_Old_size);
_Guard._Target = nullptr;
}

template <class _Ty>
Expand Down
8 changes: 0 additions & 8 deletions tests/libcxx/expected_results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,20 +324,12 @@ std/containers/container.adaptors/flat.multiset/flat.multiset.cons/move_assign.p
std/containers/container.adaptors/flat.set/flat.set.cons/move_assign.pass.cpp FAIL

# FIXME! Assertion failed: std::is_sorted(m.begin(), m.end(), m.key_comp())
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_iter_iter.pass.cpp FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_sorted_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_sorted_iter_iter.pass.cpp FAIL
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_initializer_list.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_iter.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_sorted_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_sorted_iter_iter.pass.cpp FAIL
std/containers/container.adaptors/flat.set/flat.set.modifiers/insert_transparent.pass.cpp FAIL

# FIXME! Assertion failed: r == m.begin() + 2
Expand Down