[llvm] [ADT] use correct iterator_facade_base for SmallSetIterator (PR #180967)

[via llvm-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-llvm-adt

Author: Fedor Sergeev (Theodor)

<details>
<summary>Changes</summary>

SmallSetIterator is inherently constant. Now it is properly expressed through passing const to PointerT/ReferenceT parameters of its base class. This way wrappers like make_filter_range do not try to treat SmallSetIterator as non-constant.

Fixes #<!-- -->179139

---
Full diff: https://github.com/llvm/llvm-project/pull/180967.diff


2 Files Affected:

- (modified) llvm/include/llvm/ADT/SmallSet.h (+2-1) 
- (modified) llvm/unittests/ADT/SmallSetTest.cpp (+10) 


``````````diff
diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
index 3ca833f15eed3..efbd66bb4d5b2 100644
--- a/llvm/include/llvm/ADT/SmallSet.h
+++ b/llvm/include/llvm/ADT/SmallSet.h
@@ -32,7 +32,8 @@ namespace llvm {
 template <typename T, unsigned N, typename C>
 class SmallSetIterator
     : public iterator_facade_base<SmallSetIterator<T, N, C>,
-                                  std::forward_iterator_tag, T> {
+                                  std::forward_iterator_tag, T, std::ptrdiff_t,
+                                  const T *, const T &> {
 private:
   using SetIterTy = typename std::set<T, C>::const_iterator;
   using VecIterTy = typename SmallVector<T, N>::const_iterator;
diff --git a/llvm/unittests/ADT/SmallSetTest.cpp b/llvm/unittests/ADT/SmallSetTest.cpp
index 1d1e84ba7fcfd..ac99bb2c66495 100644
--- a/llvm/unittests/ADT/SmallSetTest.cpp
+++ b/llvm/unittests/ADT/SmallSetTest.cpp
@@ -300,3 +300,13 @@ TEST(SmallSetTest, Contains) {
   EXPECT_TRUE(Set.contains(1));
   EXPECT_TRUE(Set.contains(2));
 }
+
+TEST(SmallSetTest, FilterPositive) {
+  SmallSet<int, 4> Set({3, -1, 2, -4});
+  auto PositiveRange = make_filter_range(Set, [](int V) { return V > 0; });
+  auto PositiveIt = PositiveRange.begin();
+  EXPECT_EQ(*PositiveIt, 3);
+  ++PositiveIt;
+  EXPECT_EQ(*PositiveIt, 2);
+  EXPECT_EQ(PositiveIt, PositiveRange.end());
+}

``````````

</details>


https://github.com/llvm/llvm-project/pull/180967