Skip to content

[libc++] fix flat_{multi}set insert_range #137462

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.

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion libcxx/include/__flat_set/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define _LIBCPP___FLAT_SET_UTILS_H

#include <__config>
#include <__iterator/iterator_traits.h>
#include <__ranges/access.h>
#include <__ranges/concepts.h>
#include <__type_traits/container_traits.h>
Expand Down Expand Up @@ -60,7 +61,8 @@ struct __flat_set_utils {
// C++23 Sequence Container should have insert_range member function
// Note that not all Sequence Containers provide append_range.
__set.__keys_.insert_range(__set.__keys_.end(), std::forward<_Range>(__rng));
} else if constexpr (ranges::common_range<_Range>) {
} else if constexpr (ranges::common_range<_Range> &&
__has_input_iterator_category<ranges::iterator_t<_Range>>::value) {
Comment on lines +64 to +65
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No (functional) change requested. Do we want to say the fallback branches are (pedantically) extensions?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the other hand, it seems that the missing parts of MinSequenceContainer for C++23 sequence container requirements "silently" enforced our flat_meow to contain some extensions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added static_assert in the test case

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I guess these cases should be moved to the libcxx/test/libcxx subdirectory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. moved the tests. leave this open for others to put their opinions on this "extension"

__set.__keys_.insert(__set.__keys_.end(), ranges::begin(__rng), ranges::end(__rng));
} else {
for (auto&& __x : __rng) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//===----------------------------------------------------------------------===//
//
// 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
//
//===----------------------------------------------------------------------===//

// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
// UNSUPPORTED: no-localization

// <flat_set>

// https://github.com/llvm/llvm-project/issues/136656

#include <flat_set>
#include <ranges>
#include <sstream>
#include <vector>

#include "MinSequenceContainer.h"
#include "test_macros.h"

void test() {
MinSequenceContainer<int> v;
std::flat_multiset s(v);
std::istringstream ints("0 1 1 0");
auto r = std::ranges::subrange(std::istream_iterator<int>(ints), std::istream_iterator<int>()) |
std::views::transform([](int i) { return i * i; });
static_assert(
![](auto& t) { return requires { t.insert_range(r); }; }(v),
"This test is to test the case where the underlying container does not provide insert_range");
s.insert_range(r);
}

int main(int, char**) {
test();

return 0;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//===----------------------------------------------------------------------===//
//
// 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
//
//===----------------------------------------------------------------------===//

// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
// UNSUPPORTED: no-localization

// <flat_set>

// https://github.com/llvm/llvm-project/issues/136656

#include <flat_set>
#include <ranges>
#include <sstream>
#include <vector>

#include "MinSequenceContainer.h"
#include "test_macros.h"

void test() {
MinSequenceContainer<int> v;
std::flat_set s(v);
std::istringstream ints("0 1 1 0");
auto r = std::ranges::subrange(std::istream_iterator<int>(ints), std::istream_iterator<int>()) |
std::views::transform([](int i) { return i * i; });
static_assert(
![](auto& t) { return requires { t.insert_range(r); }; }(v),
"This test is to test the case where the underlying container does not provide insert_range");
s.insert_range(r);
}

int main(int, char**) {
test();

return 0;
}
Loading