From 02d00901779cc1ae2d75de96ce32053440bfe0b4 Mon Sep 17 00:00:00 2001
From: Patrick Roberts <git@patrickroberts.dev>
Date: Mon, 1 Jun 2026 12:28:57 -0500
Subject: [PATCH] Apply fusion optimization to input iterator

---
 include/beman/any_view/any_view.hpp           | 16 -------
 include/beman/any_view/detail/iterator.hpp    |  4 +-
 .../any_view/detail/polymorphic_iterator.hpp  | 43 +++++++++++--------
 tests/beman/any_view/constexpr.test.cpp       | 16 +++++--
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/include/beman/any_view/any_view.hpp b/include/beman/any_view/any_view.hpp
index 435cf83..a6e5bd1 100644
--- a/include/beman/any_view/any_view.hpp
+++ b/include/beman/any_view/any_view.hpp
@@ -8,22 +8,6 @@
 #include <beman/any_view/detail/polymorphic_view.hpp>
 
 namespace beman::any_view {
-namespace detail {
-
-template <class T>
-struct rvalue_ref {
-    using type = T;
-};
-
-template <class T>
-struct rvalue_ref<T&> {
-    using type = T&&;
-};
-
-template <class T>
-using rvalue_ref_t = typename rvalue_ref<T>::type;
-
-} // namespace detail
 
 template <class ElementT,
           any_view_options OptsV = any_view_options::input,
diff --git a/include/beman/any_view/detail/iterator.hpp b/include/beman/any_view/detail/iterator.hpp
index bafa330..8824fd2 100644
--- a/include/beman/any_view/detail/iterator.hpp
+++ b/include/beman/any_view/detail/iterator.hpp
@@ -55,8 +55,8 @@ class iterator : public iterator_category_type<iterator_concept_t<OptsV>, std::i
     static constexpr bool random_access = flag_is_set<OptsV, any_view_options::random_access>;
     static constexpr bool contiguous    = flag_is_set<OptsV, any_view_options::contiguous>;
 
-    // do not cache an iterator reference without multi-pass guarantee
-    using cache_type       = std::conditional_t<forward, iter_cache_t<RefT>, no_cache>;
+    using cache_type =
+        std::conditional_t<convertible_to_borrowed<rvalue_ref_t<RefT>, RValueRefT>, iter_cache_t<RefT>, no_cache>;
     using polymorphic_type = polymorphic_iterator<RefT, RValueRefT, DiffT, OptsV>;
 
     static constexpr bool has_cache = not std::is_same_v<cache_type, no_cache>;
diff --git a/include/beman/any_view/detail/polymorphic_iterator.hpp b/include/beman/any_view/detail/polymorphic_iterator.hpp
index 8ee76a7..8cc7839 100644
--- a/include/beman/any_view/detail/polymorphic_iterator.hpp
+++ b/include/beman/any_view/detail/polymorphic_iterator.hpp
@@ -227,29 +227,38 @@ struct subtract_t : symmetric_binary_protocol {
 // inplace storage sufficient for two pointers
 using iterator_storage = small_storage<2 * sizeof(void*)>;
 
-template <class RefT, class RValueRefT>
-struct input_protocol : inherit<move_t<iterator_storage>,
-                                destroy_t<iterator_storage>,
-                                dereference_t<RefT>,
-                                iter_move_t<RValueRefT>,
-                                increment_t,
-                                sentinel_compare_t> {};
-
 template <class RefT>
 concept has_cache = not std::same_as<iter_cache_t<RefT>, no_cache>;
 
-template <class RefT>
-struct forward_cache_protocol : inherit<> {};
+template <class T>
+struct rvalue_ref {
+    using type = T;
+};
 
-template <has_cache RefT>
-struct forward_cache_protocol<RefT> : inherit<cache_t<RefT>, next_t<RefT>> {};
+template <class T>
+struct rvalue_ref<T&> {
+    using type = T&&;
+};
+
+template <class T>
+using rvalue_ref_t = typename rvalue_ref<T>::type;
+
+template <class RefT, class RValueRefT>
+struct input_cache_protocol : inherit<dereference_t<RefT>, iter_move_t<RValueRefT>, increment_t> {};
+
+template <has_cache RefT, class RValueRefT>
+    requires convertible_to_borrowed<rvalue_ref_t<RefT>, RValueRefT>
+struct input_cache_protocol<RefT, RValueRefT> : inherit<cache_t<RefT>, next_t<RefT>> {};
+
+template <class RefT, class RValueRefT>
+struct input_protocol : inherit<move_t<iterator_storage>,
+                                destroy_t<iterator_storage>,
+                                input_cache_protocol<RefT, RValueRefT>,
+                                sentinel_compare_t> {};
 
 template <class RefT, class RValueRefT>
-struct forward_protocol : inherit<input_protocol<RefT, RValueRefT>,
-                                  copy_t<iterator_storage>,
-                                  forward_cache_protocol<RefT>,
-                                  type_t,
-                                  equality_compare_t> {};
+struct forward_protocol
+    : inherit<input_protocol<RefT, RValueRefT>, copy_t<iterator_storage>, type_t, equality_compare_t> {};
 
 template <class RefT>
 struct bidirectional_cache_protocol : inherit<decrement_t> {};
diff --git a/tests/beman/any_view/constexpr.test.cpp b/tests/beman/any_view/constexpr.test.cpp
index 2bae2d0..be70b4a 100644
--- a/tests/beman/any_view/constexpr.test.cpp
+++ b/tests/beman/any_view/constexpr.test.cpp
@@ -65,10 +65,20 @@ TEST(ConstexprTest, sort_vector) {
     EXPECT_TRUE(sort(std::vector{6, 8, 7, 5, 3, 0, 9}));
 }
 
+template <class T>
+struct non_trivially_copyable {
+    T value;
+
+    non_trivially_copyable(const non_trivially_copyable&);
+};
+
+template <class T>
+non_trivially_copyable<T>::non_trivially_copyable(const non_trivially_copyable&) = default;
+
 constexpr auto set_front(any_view<int, forward> view, int value) {
-    // forward iterator of lvalue reference uses cache object to fuse virtual dispatches
-    static_assert(sizeof(std::ranges::iterator_t<any_view<int, forward>>) ==
-                  sizeof(std::ranges::iterator_t<any_view<int, input>>) + sizeof(int*));
+    // lvalue reference uses cache object to fuse virtual dispatches
+    static_assert(sizeof(std::ranges::iterator_t<any_view<int>>) ==
+                  sizeof(std::ranges::iterator_t<proxy_any_view<non_trivially_copyable<int>>>) + sizeof(int*));
 
     auto& ref = view.front();
     // even with cache object, lifetime of reference is not tied to lifetime of iterator