Skip to content

Fix [flat.map.modifiers] bugs found by libcxx tests #5419

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
Apr 19, 2025
Merged

Fix [flat.map.modifiers] bugs found by libcxx tests #5419

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
17 changes: 5 additions & 12 deletions stl/inc/flat_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,17 +940,8 @@ private:
// Insert the new elements at the end
for (; _First != _Last; ++_First) {
value_type _Val = *_First;
if constexpr (requires { _Data.keys.push_back(_STD move(_Val.first)); }) {
_Data.keys.push_back(_STD move(_Val.first));
} else {
_Data.keys.insert(_Data.keys.end(), _STD move(_Val.first));
}

if constexpr (requires { _Data.values.push_back(_STD move(_Val.second)); }) {
_Data.values.push_back(_STD move(_Val.second));
} else {
_Data.values.insert(_Data.values.end(), _STD move(_Val.second));
}
_Data.keys.insert(_Data.keys.end(), _STD move(_Val.first));
_Data.values.insert(_Data.values.end(), _STD move(_Val.second));
}

// Sort the newly inserted elements
Expand Down Expand Up @@ -1451,7 +1442,9 @@ public:

// [flat.multimap.modifiers] Modifiers
template <class... _ArgTypes>
iterator emplace(_ArgTypes&&... _Args) {
iterator emplace(_ArgTypes&&... _Args)
requires is_constructible_v<value_type, _ArgTypes...>
{
value_type _Val(_STD forward<_ArgTypes>(_Args)...);
return _Emplace_key_mapped(_STD move(_Val.first), _STD move(_Val.second));
}
Expand Down
15 changes: 0 additions & 15 deletions tests/libcxx/expected_results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,6 @@ std/strings/c.strings/cuchar.compile.pass.cpp FAIL

# P0429R9 <flat_map>

# FIXME! static_assert(!CanEmplace<Map, Emplaceable>);
std/containers/container.adaptors/flat.multimap/flat.multimap.modifiers/emplace.pass.cpp FAIL

# FIXME! error: no type named 'value_type' in 'std::greater<int>'
std/containers/container.adaptors/flat.map/flat.map.cons/deduct.pass.cpp FAIL
std/containers/container.adaptors/flat.multimap/flat.multimap.cons/deduct.pass.cpp FAIL
Expand All @@ -253,18 +250,6 @@ std/containers/container.adaptors/flat.multimap/flat.multimap.cons/move_exceptio
std/containers/container.adaptors/flat.map/flat.map.cons/move.pass.cpp FAIL
std/containers/container.adaptors/flat.multimap/flat.multimap.cons/move.pass.cpp FAIL

# FIXME! Assertion failed: false
std/containers/container.adaptors/flat.map/flat.map.modifiers/insert_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.map/flat.map.modifiers/insert_iter_iter.pass.cpp FAIL
std/containers/container.adaptors/flat.map/flat.map.modifiers/insert_range.pass.cpp FAIL
std/containers/container.adaptors/flat.map/flat.map.modifiers/insert_sorted_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.map/flat.map.modifiers/insert_sorted_iter_iter.pass.cpp FAIL
std/containers/container.adaptors/flat.multimap/flat.multimap.modifiers/insert_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.multimap/flat.multimap.modifiers/insert_iter_iter.pass.cpp FAIL
std/containers/container.adaptors/flat.multimap/flat.multimap.modifiers/insert_range.pass.cpp FAIL
std/containers/container.adaptors/flat.multimap/flat.multimap.modifiers/insert_sorted_initializer_list.pass.cpp FAIL
std/containers/container.adaptors/flat.multimap/flat.multimap.modifiers/insert_sorted_iter_iter.pass.cpp FAIL

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