shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[libc++] Make sure flat_{multi}map::key_compare handle boolean-testable correctly (#132621)

Browse Source 
This is sibling of
[#69378](https://github.com/llvm/llvm-project/pull/69378).

---------

Co-authored-by: Hui Xie <hui.xie1990@gmail.com>
Co-authored-by: A. Jiang <de34@live.cn>
This commit is contained in:
Hewill Kang 2026-01-03 22:52:26 +08:00 committed by GitHub
parent 19358ca38c
commit 8d879edb0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 101 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcxx/include/__flat_map/flat_map.h
View File

@ -934,7 +934,7 @@ private:
__compare_(std::forward<_CompArg>(__comp)...) {}
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __is_sorted_and_unique(auto&& __key_container) const {
auto __greater_or_equal_to = [this](const auto& __x, const auto& __y) { return !__compare_(__x, __y); };
auto __greater_or_equal_to = [this](const auto& __x, const auto& __y) -> bool { return !__compare_(__x, __y); };
return ranges::adjacent_find(__key_container, __greater_or_equal_to) == ranges::end(__key_container);
}
@ -967,7 +967,7 @@ private:
auto __zv = ranges::views::zip(__containers_.keys, __containers_.values);
auto __append_start_offset = __containers_.keys.size() - __num_of_appended;
auto __end = __zv.end();
auto __compare_key = [this](const auto& __p1, const auto& __p2) {
auto __compare_key = [this](const auto& __p1, const auto& __p2) -> bool {
return __compare_(std::get<0>(__p1), std::get<0>(__p2));
};
if constexpr (!_WasSorted) {

2
libcxx/include/__flat_map/flat_multimap.h
View File

@ -854,7 +854,7 @@ private:
auto __zv = ranges::views::zip(__containers_.keys, __containers_.values);
auto __append_start_offset = __containers_.keys.size() - __num_appended;
auto __end = __zv.end();
auto __compare_key = [this](const auto& __p1, const auto& __p2) {
auto __compare_key = [this](const auto& __p1, const auto& __p2) -> bool {
return __compare_(std::get<0>(__p1), std::get<0>(__p2));
};
if constexpr (!_WasSorted) {

51
libcxx/test/std/containers/container.adaptors/flat.map/robust_against_nonbool.compile.pass.cpp Normal file
View File

@ -0,0 +1,51 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
// REQUIRES: std-at-least-c++23
// <flat_map>
//
// flat_map should support comparator that return a non-boolean
// value as long as the returned type is implicitly convertible to bool.
#include <flat_map>
#include <vector>
#include <ranges>
#include "boolean_testable.h"
void test() {
using Key = StrictComparable<int>;
using Value = StrictComparable<int>;
std::flat_map<Key, Value> m1;
std::flat_map m2(std::from_range, m1, StrictBinaryPredicate);
std::flat_map m3(std::sorted_unique, m1.keys(), m1.values(), StrictBinaryPredicate);
std::flat_map m4(m1.begin(), m1.end(), StrictBinaryPredicate);
m2.insert(m1.begin(), m1.end());
m2.insert(std::sorted_unique, m1.begin(), m1.end());
m2.insert_range(m1);
(void)m2.at(2);
m3[1] = 2;
m3.insert_or_assign(1, 2);
m4.try_emplace(1, 2);
m2.emplace(1, 2);
m2.emplace_hint(m2.begin(), 1, 2);
for (const auto& [k, v] : m2) {
(void)k;
(void)v;
}
(void)m2.find(Key{1});
(void)m2.equal_range(Key{1});
(void)(m2 == m2);
m2.erase(m2.begin());
m2.erase(m2.begin(), m2.end());
std::erase_if(
m2, []<class T>(std::pair<const StrictComparable<T>&, const StrictComparable<T>&>) -> BooleanTestable const& {
return yes;
});
}

47
libcxx/test/std/containers/container.adaptors/flat.multimap/robust_against_nonbool.compile.pass.cpp Normal file
View File

@ -0,0 +1,47 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
// REQUIRES: std-at-least-c++23
// <flat_map>
//
// flat_multimap should support comparator that return a non-boolean
// value as long as the returned type is implicitly convertible to bool.
#include <flat_map>
#include <ranges>
#include <vector>
#include "boolean_testable.h"
void test() {
using Key = StrictComparable<int>;
using Value = StrictComparable<int>;
std::flat_multimap<Key, Value> m1;
std::flat_multimap m2(std::from_range, m1, StrictBinaryPredicate);
std::flat_multimap m3(std::sorted_equivalent, m1.keys(), m1.values(), StrictBinaryPredicate);
std::flat_multimap m4(m1.begin(), m1.end(), StrictBinaryPredicate);
m2.insert(m1.begin(), m1.end());
m2.insert(std::sorted_equivalent, m1.begin(), m1.end());
m2.insert_range(m1);
m2.emplace(1, 2);
m2.emplace_hint(m2.begin(), 1, 2);
for (const auto& [k, v] : m2) {
(void)k;
(void)v;
}
(void)m2.find(Key{1});
(void)m2.equal_range(Key{1});
(void)(m2 == m2);
m2.erase(m2.begin());
m2.erase(m2.begin(), m2.end());
std::erase_if(
m2, []<class T>(std::pair<const StrictComparable<T>&, const StrictComparable<T>&>) -> BooleanTestable const& {
return yes;
});
}