[PATCH] D101621: [STLExtras] Add a two argument form of make_early_inc_range

[Jay Foad via Phabricator via llvm-commits]

foad created this revision.
Herald added subscribers: dexonsmith, hiraditya, MatzeB.
foad requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

It seems convenient to me to be able to use make_early_inc_range as a
direct replacement for make_range, so you can change:

  make_range(X, Y)

into:

  make_early_inc_range(X, Y)

instead of:

  make_early_inc_range(make_range(X, Y))


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D101621

Files:
  llvm/include/llvm/ADT/STLExtras.h
  llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
  llvm/lib/Transforms/Scalar/LoopInterchange.cpp


Index: llvm/lib/Transforms/Scalar/LoopInterchange.cpp
===================================================================
--- llvm/lib/Transforms/Scalar/LoopInterchange.cpp
+++ llvm/lib/Transforms/Scalar/LoopInterchange.cpp
@@ -1325,9 +1325,8 @@
   BasicBlock *OuterLoopHeader = OuterLoop->getHeader();
   if (InnerLoopPreHeader != OuterLoopHeader) {
     SmallPtrSet<Instruction *, 4> NeedsMoving;
-    for (Instruction &I :
-         make_early_inc_range(make_range(InnerLoopPreHeader->begin(),
-                                         std::prev(InnerLoopPreHeader->end()))))
+    for (Instruction &I : make_early_inc_range(
+             InnerLoopPreHeader->begin(), std::prev(InnerLoopPreHeader->end())))
       I.moveBefore(OuterLoopHeader->getTerminator());
   }
 
Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
===================================================================
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
@@ -1060,8 +1060,8 @@
   if (FirstTerm != InsertBB->end()) {
     assert(!FirstTerm->isDebugValue() &&
            "first terminator cannot be a debug value");
-    for (MachineInstr &MI : make_early_inc_range(
-             make_range(std::next(FirstTerm), InsertBB->end()))) {
+    for (MachineInstr &MI :
+         make_early_inc_range(std::next(FirstTerm), InsertBB->end())) {
       if (!MI.isDebugValue())
         continue;
 
Index: llvm/include/llvm/ADT/STLExtras.h
===================================================================
--- llvm/include/llvm/ADT/STLExtras.h
+++ llvm/include/llvm/ADT/STLExtras.h
@@ -585,6 +585,16 @@
                     EarlyIncIteratorT(std::end(std::forward<RangeT>(Range))));
 }
 
+/// Make a range that does early increment given the start and end iterators.
+/// This is a convenience form of make_early_inc_range(Range) which allows
+/// make_early_inc_range to be used as a direct replacement for make_range.
+template <typename IteratorT>
+iterator_range<
+    early_inc_iterator_impl<detail::IterOfRange<iterator_range<IteratorT>>>>
+make_early_inc_range(IteratorT X, IteratorT Y) {
+  return make_early_inc_range(make_range(X, Y));
+}
+
 // forward declarations required by zip_shortest/zip_first/zip_longest
 template <typename R, typename UnaryPredicate>
 bool all_of(R &&range, UnaryPredicate P);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D101621.341859.patch
Type: text/x-patch
Size: 2364 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210430/0f4cd3b8/attachment.bin>