From 0986433401067c72816450e64d73a79f16cc3c5e Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Wed, 3 Nov 2021 23:59:05 +0000 Subject: [PATCH] Revert "Fix iterator_adaptor_base/enumerator_iter to allow composition of llvm::enumerate with llvm::make_filter_range" This reverts commit ba7a6b314fd14bb2c9ff5d3f4fe2b6525514cada. Post-commit review showed that the fix implemented wasn't correct, and a more principled fix is possible. --- llvm/include/llvm/ADT/STLExtras.h | 3 ++- llvm/include/llvm/ADT/iterator.h | 3 +-- llvm/unittests/ADT/IteratorTest.cpp | 10 ---------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h index a005617..68bc656 100644 --- a/llvm/include/llvm/ADT/STLExtras.h +++ b/llvm/include/llvm/ADT/STLExtras.h @@ -1907,7 +1907,8 @@ class enumerator_iter : public iterator_facade_base< enumerator_iter, std::forward_iterator_tag, result_pair, typename std::iterator_traits>::difference_type, - typename std::iterator_traits>::pointer> { + typename std::iterator_traits>::pointer, + typename std::iterator_traits>::reference> { using result_type = result_pair; public: diff --git a/llvm/include/llvm/ADT/iterator.h b/llvm/include/llvm/ADT/iterator.h index b93aaf3..b9bac9d 100644 --- a/llvm/include/llvm/ADT/iterator.h +++ b/llvm/include/llvm/ADT/iterator.h @@ -296,8 +296,7 @@ public: return LHS.I < RHS.I; } - const ReferenceT operator*() const { return *I; } - ReferenceT operator*() { return *I; } + ReferenceT operator*() const { return *I; } }; /// An iterator type that allows iterating over the pointees via some diff --git a/llvm/unittests/ADT/IteratorTest.cpp b/llvm/unittests/ADT/IteratorTest.cpp index f5fa88e..de74811 100644 --- a/llvm/unittests/ADT/IteratorTest.cpp +++ b/llvm/unittests/ADT/IteratorTest.cpp @@ -178,16 +178,6 @@ TEST(FilterIteratorTest, Lambda) { EXPECT_EQ((SmallVector{1, 3, 5}), Actual); } -TEST(FilterIteratorTest, Enumerate) { - auto IsOdd = [](auto N) { return N.value() % 2 == 1; }; - int A[] = {0, 1, 2, 3, 4, 5, 6}; - auto Enumerate = llvm::enumerate(A); - SmallVector Actual; - for (auto IndexedValue : make_filter_range(Enumerate, IsOdd)) - Actual.push_back(IndexedValue.value()); - EXPECT_EQ((SmallVector{1, 3, 5}), Actual); -} - TEST(FilterIteratorTest, CallableObject) { int Counter = 0; struct Callable { -- 2.7.4