Merge pull request swiftlang#27077 from gottesmm/pr-e1f0b2947769b49a7a4022ca7a513181461bde87

Author: swift-ci

include/swift/Basic/Range.h

@@ -239,97 +239,6 @@ static inline auto reverse_range(unsigned start, unsigned end) ->
   return reversed(range(start+1, end+1));
 }
 
-/// A random access range that provides iterators that can be used to iterate
-/// over the (element, index) pairs of a collection.
-template <typename IterTy> class EnumeratorRange {
-public:
-  using IterTraitsTy = typename std::iterator_traits<IterTy>;
-  static_assert(std::is_same<typename IterTraitsTy::iterator_category,
-                             std::random_access_iterator_tag>::value,
-                "Expected a random access iterator");
-
-private:
-  IterTy Begin;
-  IterTy End;
-
-public:
-  EnumeratorRange(IterTy begin, IterTy end) : Begin(begin), End(end) {}
-
-  class iterator {
-    friend class EnumeratorRange;
-    IterTy Begin;
-    IterTy Iter;
-
-    iterator(IterTy begin, IterTy iter) : Begin(begin), Iter(iter) {}
-
-  public:
-    using value_type =
-        std::pair<typename std::iterator_traits<IterTy>::value_type, int>;
-    using reference =
-        std::pair<typename std::iterator_traits<IterTy>::value_type, int>;
-    using pointer = void;
-    using iterator_category = std::random_access_iterator_tag;
-    using difference_type = int;
-
-    value_type operator*() const { return {*Iter, std::distance(Begin, Iter)}; }
-    iterator &operator++() {
-      Iter++;
-      return *this;
-    }
-    iterator operator++(int) { return iterator(Begin, Iter++); }
-    iterator &operator--() {
-      Iter--;
-      return *this;
-    }
-    iterator operator--(int) { return iterator(Begin, Iter--); }
-    bool operator==(iterator rhs) { return Iter == rhs.Iter; }
-    bool operator!=(iterator rhs) { return !(*this == rhs); }
-
-    iterator &operator+=(difference_type i) {
-      std::advance(Iter, i);
-      return *this;
-    }
-    iterator operator+(difference_type i) const {
-      auto IterCopy = Iter;
-      std::advance(IterCopy, i);
-      return iterator(Begin, IterCopy);
-    }
-    friend iterator operator+(difference_type i, iterator base) {
-      std::advance(base.Iter, i);
-      return base;
-    }
-    iterator &operator-=(difference_type i) {
-      *this += -i;
-      return *this;
-    }
-    iterator operator-(difference_type i) const {
-      auto NewIter = *this;
-      return NewIter -= i;
-    }
-    difference_type operator-(iterator rhs) const {
-      return difference_type(std::distance(Iter, rhs.Iter));
-    }
-  };
-
-  iterator begin() const { return iterator(Begin, Begin); }
-  iterator end() const { return iterator(Begin, End); }
-
-  using reverse_iterator = std::reverse_iterator<iterator>;
-  reverse_iterator rbegin() const { return reverse_iterator(end()); }
-  reverse_iterator rend() const { return reverse_iterator(begin()); }
-};
-
-/// enumerate - Given a type that's subscriptable with integers, return an
-/// IntEnumerateRange consisting of the valid subscripts.
-template <class T>
-EnumeratorRange<typename T::iterator> enumerate(T &collection) {
-  return EnumeratorRange<typename T::iterator>(collection.begin(),
-                                               collection.end());
-}
-template <class T> EnumeratorRange<T> enumerate(T Begin, T End) {
-  return EnumeratorRange<T>(Begin, End);
-}
-
 } // end namespace swift
 
 #endif // SWIFT_BASIC_RANGE_H

include/swift/SIL/PostOrder.h

@@ -70,14 +70,6 @@ class PostOrderFunctionInfo {
                       PostOrder.rend());
   }
 
-  using enumerated_range = EnumeratorRange<decltype(PostOrder)::iterator>;
-  enumerated_range getEnumeratedPostOrder() { return enumerate(PostOrder); }
-  using reverse_enumerated_range =
-      EnumeratorRange<decltype(PostOrder)::reverse_iterator>;
-  reverse_enumerated_range getEnumeratedReversePostOrder() {
-    return enumerate(PostOrder.rbegin(), PostOrder.rend());
-  }
-
   unsigned size() const { return PostOrder.size(); }
 
   Optional<unsigned> getPONumber(SILBasicBlock *BB) const {

lib/SILOptimizer/Analysis/LoopRegionAnalysis.cpp

@@ -355,9 +355,9 @@ void LoopRegionFunctionInfo::initializeBlockRegions(PostOrderFunctionInfo *PI,
   // Initialize regions for each BB and associate RPO numbers with each BB.
   //
   // We use the RPO number of a BB as its Index in our data structures.
-  for (auto P : PI->getEnumeratedReversePostOrder()) {
-    BlockTy *BB = P.first;
-    unsigned RPOIndex = P.second;
+  for (auto P : llvm::enumerate(PI->getReversePostOrder())) {
+    BlockTy *BB = P.value();
+    unsigned RPOIndex = P.index();
     auto *BBRegion = createRegion(BB, RPOIndex);
     assert(BBRegion && "Create region fail to create a BB?");
     assert(*PI->getRPONumber(BB) == RPOIndex &&