[llvm] 75272d5 - [ADT] Relax type requirements for `is_contained`
Jakub Kuderski via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 21 10:14:33 PST 2023
Author: Jakub Kuderski
Date: 2023-02-21T13:12:50-05:00
New Revision: 75272d5c1299db93aa619fc9e616832f578726c2
URL: https://github.com/llvm/llvm-project/commit/75272d5c1299db93aa619fc9e616832f578726c2
DIFF: https://github.com/llvm/llvm-project/commit/75272d5c1299db93aa619fc9e616832f578726c2.diff
LOG: [ADT] Relax type requirements for `is_contained`
- Do not require both the `Set` and `Element` to be exactly the same type and, instead, only require them to be comparable.
- Do not require `Element` to be copyable.
- Add missing documentation comment.
Reviewed By: beanz
Differential Revision: https://reviews.llvm.org/D144416
Added:
Modified:
llvm/include/llvm/ADT/STLExtras.h
llvm/unittests/ADT/STLExtrasTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
index 79b145632d5a1..a5cb73dfb6130 100644
--- a/llvm/include/llvm/ADT/STLExtras.h
+++ b/llvm/include/llvm/ADT/STLExtras.h
@@ -1870,11 +1870,13 @@ bool is_contained(R &&Range, const E &Element) {
return std::find(adl_begin(Range), adl_end(Range), Element) != adl_end(Range);
}
-template <typename T>
-constexpr bool is_contained(std::initializer_list<T> Set, T Value) {
+/// Returns true iff \p Element exists in \p Set. This overload takes \p Set as
+/// an initializer list and is `constexpr`-friendly.
+template <typename T, typename E>
+constexpr bool is_contained(std::initializer_list<T> Set, const E &Element) {
// TODO: Use std::find when we switch to C++20.
- for (T V : Set)
- if (V == Value)
+ for (const T &V : Set)
+ if (V == Element)
return true;
return false;
}
diff --git a/llvm/unittests/ADT/STLExtrasTest.cpp b/llvm/unittests/ADT/STLExtrasTest.cpp
index 4a9c745f5328f..4c31b4f1ca47a 100644
--- a/llvm/unittests/ADT/STLExtrasTest.cpp
+++ b/llvm/unittests/ADT/STLExtrasTest.cpp
@@ -947,11 +947,28 @@ enum Doggos {
Longboi,
};
+struct WooferCmp {
+ // Not copyable.
+ WooferCmp(const WooferCmp &) = delete;
+ WooferCmp &operator=(const WooferCmp &) = delete;
+
+ friend bool operator==(const Doggos &Doggo, const WooferCmp &) {
+ return Doggo == Doggos::Woofer;
+ }
+};
+
TEST(STLExtrasTest, IsContainedInitializerList) {
EXPECT_TRUE(is_contained({Woofer, SubWoofer}, Woofer));
EXPECT_TRUE(is_contained({Woofer, SubWoofer}, SubWoofer));
EXPECT_FALSE(is_contained({Woofer, SubWoofer}, Pupper));
- EXPECT_FALSE(is_contained({}, Longboi));
+
+ // Check that the initializer list type and the element type do not have to
+ // match exactly.
+ EXPECT_TRUE(is_contained({Floofer, Woofer, SubWoofer}, WooferCmp{}));
+ EXPECT_FALSE(is_contained({Floofer, SubWoofer}, WooferCmp{}));
+
+ EXPECT_TRUE(is_contained({"a", "bb", "ccc", "dddd"}, llvm::StringRef("ccc")));
+ EXPECT_FALSE(is_contained({"a", "bb", "ccc", "dddd"}, llvm::StringRef("x")));
static_assert(is_contained({Woofer, SubWoofer}, SubWoofer), "SubWoofer!");
static_assert(!is_contained({Woofer, SubWoofer}, Pupper), "Missing Pupper!");
More information about the llvm-commits
mailing list