llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-llvm-adt Author: Victor Campos (vhscampos) <details> <summary>Changes</summary> This patch adds useful methods to the SmallSet API: - Constructor that takes pair of iterators. - Constructor that takes a range. - Constructor that takes an initializer list. - Copy constructor. - Move constructor. - Copy assignment operator. - Move assignment operator. --- Full diff: https://github.com/llvm/llvm-project/pull/108601.diff 2 Files Affected: - (modified) llvm/include/llvm/ADT/SmallSet.h (+18-3) - (modified) llvm/unittests/ADT/SmallSetTest.cpp (+60) ``````````diff diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h index c8641111eda8f8..2e26ad65eb2dd6 100644 --- a/llvm/include/llvm/ADT/SmallSet.h +++ b/llvm/include/llvm/ADT/SmallSet.h @@ -14,14 +14,13 @@ #ifndef LLVM_ADT_SMALLSET_H #define LLVM_ADT_SMALLSET_H +#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/iterator.h" -#include "llvm/Support/Compiler.h" -#include "llvm/Support/type_traits.h" #include <cstddef> #include <functional> +#include <initializer_list> #include <set> #include <type_traits> #include <utility> @@ -151,6 +150,22 @@ class SmallSet { using const_iterator = SmallSetIterator<T, N, C>; SmallSet() = default; + SmallSet(const SmallSet &) = default; + SmallSet(SmallSet &&) = default; + + template <typename IterT> SmallSet(IterT Begin, IterT End) { + this->insert(Begin, End); + } + + template <typename RangeT> + explicit SmallSet(const iterator_range<RangeT> &R) { + this->insert(R.begin(), R.end()); + } + + SmallSet(std::initializer_list<T> L) { this->insert(L.begin(), L.end()); } + + SmallSet &operator=(const SmallSet &) = default; + SmallSet &operator=(SmallSet &&) = default; [[nodiscard]] bool empty() const { return Vector.empty() && Set.empty(); } diff --git a/llvm/unittests/ADT/SmallSetTest.cpp b/llvm/unittests/ADT/SmallSetTest.cpp index b50b368ae66361..ced1ba5dce34d8 100644 --- a/llvm/unittests/ADT/SmallSetTest.cpp +++ b/llvm/unittests/ADT/SmallSetTest.cpp @@ -17,6 +17,66 @@ using namespace llvm; +TEST(SmallSetTest, ConstructorIteratorPair) { + auto L = {1, 2, 3, 4, 5}; + SmallSet<int, 4> S(std::begin(L), std::end(L)); + for (int Value : L) + EXPECT_TRUE(S.contains(Value)); +} + +TEST(SmallSet, ConstructorRange) { + auto L = {1, 2, 3, 4, 5}; + + SmallSet<int, 4> S(llvm::make_range(std::begin(L), std::end(L))); + for (int Value : L) + EXPECT_TRUE(S.contains(Value)); +} + +TEST(SmallSet, ConstructorInitializerList) { + auto L = {1, 2, 3, 4, 5}; + SmallSet<int, 4> S = {1, 2, 3, 4, 5}; + for (int Value : L) + EXPECT_TRUE(S.contains(Value)); +} + +TEST(SmallSet, CopyConstructor) { + SmallSet<int, 4> S = {1, 2, 3}; + SmallSet<int, 4> T = S; + + EXPECT_EQ(S, T); +} + +TEST(SmallSet, MoveConstructor) { + auto L = {1, 2, 3}; + SmallSet<int, 4> S = L; + SmallSet<int, 4> T = std::move(S); + + EXPECT_TRUE(T.size() == L.size()); + for (int Value : L) { + EXPECT_TRUE(T.contains(Value)); + } +} + +TEST(SmallSet, CopyAssignment) { + SmallSet<int, 4> S = {1, 2, 3}; + SmallSet<int, 4> T; + T = S; + + EXPECT_EQ(S, T); +} + +TEST(SmallSet, MoveAssignment) { + auto L = {1, 2, 3}; + SmallSet<int, 4> S = L; + SmallSet<int, 4> T; + T = std::move(S); + + EXPECT_TRUE(T.size() == L.size()); + for (int Value : L) { + EXPECT_TRUE(T.contains(Value)); + } +} + TEST(SmallSetTest, Insert) { SmallSet<int, 4> s1; `````````` </details> https://github.com/llvm/llvm-project/pull/108601 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
