From 223a6f94c59c00733763bacc43f5b9458b4cc6f4 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Wed, 6 Jan 2021 12:03:34 +0000
Subject: [PATCH] [libc] remove modulo from CircularArrayRef iterator

---
 libc/benchmarks/LibcBenchmark.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libc/benchmarks/LibcBenchmark.h b/libc/benchmarks/LibcBenchmark.h
index 6516e5f..af6173a 100644
--- a/libc/benchmarks/LibcBenchmark.h
+++ b/libc/benchmarks/LibcBenchmark.h
@@ -275,17 +275,21 @@ public:
       : public std::iterator<std::input_iterator_tag, T, ssize_t> {
     llvm::ArrayRef<T> Array;
     size_t Index;
+    size_t Offset;
 
   public:
     explicit const_iterator(llvm::ArrayRef<T> Array, size_t Index = 0)
-        : Array(Array), Index(Index) {}
+        : Array(Array), Index(Index), Offset(Index % Array.size()) {}
     const_iterator &operator++() {
       ++Index;
+      ++Offset;
+      if (Offset == Array.size())
+        Offset = 0;
       return *this;
     }
     bool operator==(const_iterator Other) const { return Index == Other.Index; }
     bool operator!=(const_iterator Other) const { return !(*this == Other); }
-    const T &operator*() const { return Array[Index % Array.size()]; }
+    const T &operator*() const { return Array[Offset]; }
   };
 
   CircularArrayRef(llvm::ArrayRef<T> Array, size_t Size)
-- 
2.7.4